diff --git a/src/config.c b/src/config.c
index 8dfd7d6c2..dd709f765 100644
--- a/src/config.c
+++ b/src/config.c
@@ -8,7 +8,7 @@
  *
  *		Configuration file handler.
  *
- * Version:	@(#)config.c	1.0.42	2018/02/10
+ * Version:	@(#)config.c	1.0.43	2018/03/06
  *
  * Authors:	Sarah Walker,
  *		Miran Grca, <mgrca8@gmail.com>
@@ -36,10 +36,10 @@
 #include "device.h"
 #include "lpt.h"
 #include "cdrom/cdrom.h"
-#include "zip.h"
 #include "disk/hdd.h"
 #include "disk/hdc.h"
 #include "disk/hdc_ide.h"
+#include "disk/zip.h"
 #include "floppy/fdd.h"
 #include "floppy/fdc.h"
 #include "game/gameport.h"
diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c
index 5408cbfb2..1127c9651 100644
--- a/src/disk/hdc_ide.c
+++ b/src/disk/hdc_ide.c
@@ -9,7 +9,7 @@
  *		Implementation of the IDE emulation for hard disks and ATAPI
  *		CD-ROM devices.
  *
- * Version:	@(#)hdc_ide.c	1.0.30	2018/03/02
+ * Version:	@(#)hdc_ide.c	1.0.31	2018/03/06
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -37,12 +37,12 @@
 #include "../device.h"
 #include "../cdrom/cdrom.h"
 #include "../scsi/scsi.h"
-#include "../zip.h"
 #include "../plat.h"
 #include "../ui.h"
 #include "hdc.h"
 #include "hdc_ide.h"
 #include "hdd.h"
+#include "zip.h"
 
 
 /* Bits of 'atastat' */
diff --git a/src/zip.c b/src/disk/zip.c
similarity index 99%
rename from src/zip.c
rename to src/disk/zip.c
index 0cbd43ce5..40eaa9de8 100644
--- a/src/zip.c
+++ b/src/disk/zip.c
@@ -9,7 +9,7 @@
  *		Implementation of the Iomega ZIP drive with SCSI(-like)
  *		commands, for both ATAPI and SCSI usage.
  *
- * Version:	@(#)zip.c	1.0.6	2018/02/27
+ * Version:	@(#)zip.c	1.0.7	2018/03/06
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *
@@ -22,17 +22,17 @@
 #include <stdarg.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "86box.h"
-#include "config.h"
-#include "timer.h"
-#include "device.h"
-#include "piix.h"
-#include "scsi/scsi.h"
-#include "nvr.h"
-#include "disk/hdc.h"
-#include "disk/hdc_ide.h"
-#include "plat.h"
-#include "ui.h"
+#include "../86box.h"
+#include "../config.h"
+#include "../timer.h"
+#include "../device.h"
+#include "../piix.h"
+#include "../scsi/scsi.h"
+#include "../nvr.h"
+#include "../plat.h"
+#include "../ui.h"
+#include "hdc.h"
+#include "hdc_ide.h"
 #include "zip.h"
 
 
diff --git a/src/zip.h b/src/disk/zip.h
similarity index 100%
rename from src/zip.h
rename to src/disk/zip.h
diff --git a/src/floppy/fdd.c b/src/floppy/fdd.c
index 95cee85b5..4c048e93a 100644
--- a/src/floppy/fdd.c
+++ b/src/floppy/fdd.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the floppy drive emulation.
  *
- * Version:	@(#)fdd.c	1.0.7	2018/01/18
+ * Version:	@(#)fdd.c	1.0.8	2018/03/06
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -523,6 +523,7 @@ double fdd_real_period(int drive)
 		return (32.0 * dusec);
 	}
 
+#if defined(DEV_BRANCH) && defined(USE_MRTHOR)
 	if (romset == ROM_MRTHOR)
 	{
 		return (ddbp * dusec) / 4.0;
@@ -531,6 +532,9 @@ double fdd_real_period(int drive)
 	{
 		return (ddbp * dusec);
 	}
+#else
+	return (ddbp * dusec);
+#endif
 }
 
 void fdd_poll(int drive)
diff --git a/src/floppy/fdd_imd.c b/src/floppy/fdd_imd.c
index 0eef14d34..ca56f5fe7 100644
--- a/src/floppy/fdd_imd.c
+++ b/src/floppy/fdd_imd.c
@@ -8,7 +8,7 @@
  *
  *		Implementation of the IMD floppy image format.
  *
- * Version:	@(#)fdd_imd.c	1.0.6	2018/01/16
+ * Version:	@(#)fdd_imd.c	1.0.7	2018/03/06
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *		Copyright 2016-2018 Miran Grca.
@@ -691,7 +691,7 @@ void imd_set_sector(int drive, int side, uint8_t c, uint8_t h, uint8_t r, uint8_
 	int sc = 0;
 	int sh = 0;
 	int sn = 0;
-	char *c_map, *h_map, *r_map, *n_map;
+	char *c_map = 0, *h_map = 0, *r_map = 0, *n_map = 0;
 	uint8_t id[4] = { 0, 0, 0, 0 };
 	sc = imd[drive].tracks[track][side].params[1];
 	sh = imd[drive].tracks[track][side].params[2];
@@ -734,7 +734,7 @@ void imd_writeback(int drive)
 
 	int i = 0;
 
-	char *n_map;
+	char *n_map = 0;
 
 	uint8_t h, n, spt;
 	uint32_t ssize;
diff --git a/src/pc.c b/src/pc.c
index aee2d5b47..224607f7d 100644
--- a/src/pc.c
+++ b/src/pc.c
@@ -8,7 +8,7 @@
  *
  *		Main emulator module where most things are controlled.
  *
- * Version:	@(#)pc.c	1.0.61	2018/03/02
+ * Version:	@(#)pc.c	1.0.62	2018/03/06
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -56,10 +56,10 @@
 #include "disk/hdd.h"
 #include "disk/hdc.h"
 #include "disk/hdc_ide.h"
+#include "disk/zip.h"
 #include "cdrom/cdrom.h"
 #include "cdrom/cdrom_image.h"
 #include "cdrom/cdrom_null.h"
-#include "zip.h"
 #include "scsi/scsi.h"
 #include "network/network.h"
 #include "sound/sound.h"
diff --git a/src/scsi/scsi.c b/src/scsi/scsi.c
index e46c7b140..fa4033ec5 100644
--- a/src/scsi/scsi.c
+++ b/src/scsi/scsi.c
@@ -8,7 +8,7 @@
  *
  *		Handling of the SCSI controllers.
  *
- * Version:	@(#)scsi.c	1.0.15	2018/02/18
+ * Version:	@(#)scsi.c	1.0.16	2018/03/06
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -28,8 +28,8 @@
 #include "../timer.h"
 #include "../device.h"
 #include "../cdrom/cdrom.h"
-#include "../zip.h"
 #include "../disk/hdc.h"
+#include "../disk/zip.h"
 #include "../plat.h"
 #include "scsi.h"
 #include "scsi_aha154x.h"
diff --git a/src/scsi/scsi_device.c b/src/scsi/scsi_device.c
index b2a199f0c..646189628 100644
--- a/src/scsi/scsi_device.c
+++ b/src/scsi/scsi_device.c
@@ -8,7 +8,7 @@
  *
  *		The generic SCSI device command handler.
  *
- * Version:	@(#)scsi_device.c	1.0.12	2018/02/17
+ * Version:	@(#)scsi_device.c	1.0.13	2018/03/06
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -23,8 +23,8 @@
 #include "../86box.h"
 #include "../device.h"
 #include "../cdrom/cdrom.h"
-#include "../zip.h"
 #include "../disk/hdd.h"
+#include "../disk/zip.h"
 #include "scsi.h"
 #include "scsi_disk.h"
 
diff --git a/src/video/vid_t1000.c b/src/video/vid_t1000.c
index 2f75c22ed..a71e10b8e 100644
--- a/src/video/vid_t1000.c
+++ b/src/video/vid_t1000.c
@@ -366,7 +366,7 @@ static void t1000_cgaline4(t1000_t *t1000)
 {
 	int x, c;
 	uint8_t dat, pattern;
-	uint32_t ink0, ink1;
+	uint32_t ink0 = 0, ink1 = 0;
 	uint16_t addr;
 
 	uint16_t ma = (t1000->cga.crtc[13] | (t1000->cga.crtc[12] << 8)) & 0x3fff;
diff --git a/src/win/win_cdrom.c b/src/win/win_cdrom.c
index 3154760f4..b27433fb9 100644
--- a/src/win/win_cdrom.c
+++ b/src/win/win_cdrom.c
@@ -8,14 +8,14 @@
  *
  *		Handle the platform-side of CDROM drives.
  *
- * Version:	@(#)win_cdrom.c	1.0.4	2017/10/16
+ * Version:	@(#)win_cdrom.c	1.0.5	2018/03/06
  *
  * Authors:	Sarah Walker, <http://pcem-emulator.co.uk/>
  *		Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
  *
- *		Copyright 2016,2017 Miran Grca.
- *		Copyright 2017 Fred N. van Kempen.
+ *		Copyright 2016-2018 Miran Grca.
+ *		Copyright 2017,2018 Fred N. van Kempen.
  */
 #define UNICODE
 #define BITMAP WINDOWS_BITMAP
@@ -31,8 +31,8 @@
 #include "../cdrom/cdrom.h"
 #include "../cdrom/cdrom_image.h"
 #include "../cdrom/cdrom_null.h"
-#include "../zip.h"
 #include "../disk/hdd.h"
+#include "../disk/zip.h"
 #include "../scsi/scsi.h"
 #include "../scsi/scsi_disk.h"
 #include "../plat.h"
diff --git a/src/win/win_new_floppy.c b/src/win/win_new_floppy.c
index e826a0d37..1d8ed7589 100644
--- a/src/win/win_new_floppy.c
+++ b/src/win/win_new_floppy.c
@@ -8,7 +8,7 @@
  *
  *		Handle the New Floppy Image dialog.
  *
- * Version:	@(#)win_new_floppy.c	1.0.3	2018/03/05
+ * Version:	@(#)win_new_floppy.c	1.0.4	2018/03/06
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *
@@ -29,7 +29,7 @@
 #include "../plat.h"
 #include "../random.h"
 #include "../ui.h"
-#include "../zip.h"
+#include "../disk/zip.h"
 #include "win.h"
 
 
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 7a3774941..fd5c222f2 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -8,7 +8,7 @@
  *
  *		Windows 86Box Settings dialog handler.
  *
- * Version:	@(#)win_settings.c	1.0.39	2018/02/18
+ * Version:	@(#)win_settings.c	1.0.40	2018/03/06
  *
  * Author:	Miran Grca, <mgrca8@gmail.com>
  *
@@ -37,10 +37,10 @@
 #include "../lpt.h"
 #include "../mouse.h"
 #include "../cdrom/cdrom.h"
-#include "../zip.h"
 #include "../disk/hdd.h"
 #include "../disk/hdc.h"
 #include "../disk/hdc_ide.h"
+#include "../disk/zip.h"
 #include "../floppy/fdd.h"
 #include "../scsi/scsi.h"
 #include "../network/network.h"
diff --git a/src/win/win_stbar.c b/src/win/win_stbar.c
index 6d78b745f..7f078fcc1 100644
--- a/src/win/win_stbar.c
+++ b/src/win/win_stbar.c
@@ -8,7 +8,7 @@
  *
  *		Implement the application's Status Bar.
  *
- * Version:	@(#)win_stbar.c	1.0.14	2018/02/11
+ * Version:	@(#)win_stbar.c	1.0.15	2018/03/06
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -36,9 +36,9 @@
 #include "../cdrom/cdrom.h"
 #include "../cdrom/cdrom_image.h"
 #include "../cdrom/cdrom_null.h"
-#include "../zip.h"
 #include "../disk/hdd.h"
 #include "../disk/hdc.h"
+#include "../disk/zip.h"
 #include "../floppy/fdd.h"
 #include "../scsi/scsi.h"
 #include "../scsi/scsi_disk.h"