diff --git a/src/config.c b/src/config.c
index 3bb9fb59a..2e6a5460f 100644
--- a/src/config.c
+++ b/src/config.c
@@ -3011,6 +3011,19 @@ save_other_removable_devices(void)
             else
                 ini_section_set_string(cat, temp, zip_drives[c].image_path);
         }
+
+        for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+            sprintf(temp, "zip_%02i_image_history_%02i", c + 1, i + 1);
+            if ((zip_drives[c].image_history[i] == 0) || strlen(zip_drives[c].image_history[i]) == 0)
+                ini_section_delete_var(cat, temp);
+            else {
+                path_normalize(zip_drives[c].image_history[i]);
+                if (!strnicmp(zip_drives[c].image_history[i], usr_path, strlen(usr_path)))
+                    ini_section_set_string(cat, temp, &zip_drives[c].image_history[i][strlen(usr_path)]);
+                else
+                    ini_section_set_string(cat, temp, zip_drives[c].image_history[i]);
+            }
+        }
     }
 
     for (c = 0; c < MO_NUM; c++) {
@@ -3054,6 +3067,19 @@ save_other_removable_devices(void)
             else
                 ini_section_set_string(cat, temp, mo_drives[c].image_path);
         }
+
+        for (int i = 0; i < MAX_PREV_IMAGES; i++) {
+            sprintf(temp, "mo_%02i_image_history_%02i", c + 1, i + 1);
+            if ((mo_drives[c].image_history[i] == 0) || strlen(mo_drives[c].image_history[i]) == 0)
+                ini_section_delete_var(cat, temp);
+            else {
+                path_normalize(mo_drives[c].image_history[i]);
+                if (!strnicmp(mo_drives[c].image_history[i], usr_path, strlen(usr_path)))
+                    ini_section_set_string(cat, temp, &mo_drives[c].image_history[i][strlen(usr_path)]);
+                else
+                    ini_section_set_string(cat, temp, mo_drives[c].image_history[i]);
+            }
+        }
     }
 
     ini_delete_section_if_empty(config, cat);
diff --git a/src/disk/mo.c b/src/disk/mo.c
index e5cbd9140..d59343833 100644
--- a/src/disk/mo.c
+++ b/src/disk/mo.c
@@ -1363,6 +1363,7 @@ mo_command(scsi_common_t *sc, const uint8_t *cdb)
                 mo_buf_alloc(dev, dev->packet_len);
 
                 const int ret = mo_blocks(dev, &alloc_length, 0);
+                alloc_length  = dev->requested_blocks * 512;
 
                 if (ret > 0) {
                     dev->requested_blocks = max_len;
diff --git a/src/disk/zip.c b/src/disk/zip.c
index ae3319b40..ed59154b0 100644
--- a/src/disk/zip.c
+++ b/src/disk/zip.c
@@ -1386,10 +1386,8 @@ zip_command(scsi_common_t *sc, const uint8_t *cdb)
                 dev->packet_len = max_len * alloc_length;
                 zip_buf_alloc(dev, dev->packet_len);
 
-                int ret = 0;
-
-                if (dev->sector_len > 0)
-                    ret = zip_blocks(dev, &alloc_length, 0);
+                const int ret = zip_blocks(dev, &alloc_length, 0);
+                alloc_length  = dev->requested_blocks * 512;
 
                 if (ret > 0) {
                     dev->requested_blocks = max_len;