diff --git a/firmware/target/arm/imx233/sd-imx233.c b/firmware/target/arm/imx233/sd-imx233.c
index 745a75b2dc..e979db10f9 100644
--- a/firmware/target/arm/imx233/sd-imx233.c
+++ b/firmware/target/arm/imx233/sd-imx233.c
@@ -322,8 +322,6 @@ static int transfer_sectors(IF_MD2(int drive,) unsigned long start, int count, v
     IF_MD((void) drive);
     int ret = 0;
     uint32_t resp;
-    unsigned long old_start = start;
-    int old_count = count;
 
     last_disk_activity = current_tick;
 
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 64764f178d..1db04e0cb8 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -778,7 +778,7 @@ static void handle_scsi(struct command_block_wrapper* cbw)
 #endif
 
 #ifdef HAVE_HOTSWAP
-    if(storage_removable(lun) && !storage_present(lun)) {
+    if(storage_removable(lun) && !storage_present(IF_MD(lun))) {
         ejected[lun] = true;
     }
 #endif