diff --git a/firmware/export/config-creativezv.h b/firmware/export/config-creativezv.h
index 5f0336e538..7a0c814ffc 100644
--- a/firmware/export/config-creativezv.h
+++ b/firmware/export/config-creativezv.h
@@ -165,9 +165,11 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-#define CONFIG_USBOTG	USBOTG_ISP1583
+#define CONFIG_USBOTG USBOTG_ISP1583
 #define HAVE_USBSTACK
+#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e 
 #define USB_PRODUCT_ID 0x4133
+#define USB_NUM_ENDPOINTS 7
 
 #endif /* SIMULATOR */
diff --git a/firmware/export/config-creativezvm60gb.h b/firmware/export/config-creativezvm60gb.h
index a0cf2ba918..490db1f861 100644
--- a/firmware/export/config-creativezvm60gb.h
+++ b/firmware/export/config-creativezvm60gb.h
@@ -166,9 +166,11 @@
 #define BOOTDIR "/.rockbox"
 
 /* #define CONFIG_USBOTG	USBOTG_ISP1761 */
-#define CONFIG_USBOTG	USBOTG_ISP1583
+#define CONFIG_USBOTG USBOTG_ISP1583
 #define HAVE_USBSTACK
+#define USE_ROCKBOX_USB
 #define USB_VENDOR_ID 0x041e 
 #define USB_PRODUCT_ID 0x4133
+#define USB_NUM_ENDPOINTS 7
 
 #endif /* SIMULATOR */
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
index b945d47b4b..f9acdf5eb2 100644
--- a/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
+++ b/firmware/target/arm/tms320dm320/creative-zvm/ata-creativezvm.c
@@ -31,6 +31,7 @@
 #include "ata.h"
 #include "string.h"
 #include "buffer.h"
+#include "logf.h"
 
 #undef ata_read_sectors
 #undef ata_write_sectors
@@ -363,7 +364,7 @@ static void cfs_init(void)
         logf("Sector count: %d 0x%x", vfat_sector_count, vfat_sector_count);
     }
     else
-        logf("Cannot find virtual FAT filesystem!"); //TODO: panicf
+        panicf("Cannot find virtual FAT filesystem!");
 
     cfs_inited = true;
 }