diff --git a/src/WIN/86Box.rc b/src/WIN/86Box.rc
index b4983a802..66d42bb21 100644
--- a/src/WIN/86Box.rc
+++ b/src/WIN/86Box.rc
@@ -90,6 +90,7 @@ BEGIN
         END
         MENUITEM "S&tatus",                     IDM_STATUS
     END
+#ifdef ENABLE_LOG_TOGGLES
     POPUP "&Logging"
     BEGIN
 #ifdef ENABLE_BUSLOGIC_LOG
@@ -123,6 +124,7 @@ BEGIN
 # endif
 #endif
     END
+#endif
     POPUP "&Help"
     BEGIN
         MENUITEM "&About 86Box...",             IDM_ABOUT
diff --git a/src/WIN/resource.h b/src/WIN/resource.h
index b89a90fd3..3dcf6b3be 100644
--- a/src/WIN/resource.h
+++ b/src/WIN/resource.h
@@ -29,7 +29,7 @@
 
 #define DLG_ABOUT			101
 #define DLG_STATUS			102
-#define DLG_CONFIG			110
+#define DLG_CFG_MAIN			110
 #define DLG_CFG_MACHINE			111
 #define DLG_CFG_VIDEO			112
 #define DLG_CFG_INPUT			113
diff --git a/src/WIN/win_settings.c b/src/WIN/win_settings.c
index 392477e9d..1ca1a4a13 100644
--- a/src/WIN/win_settings.c
+++ b/src/WIN/win_settings.c
@@ -4240,5 +4240,5 @@ static BOOL CALLBACK win_settings_main_proc(HWND hdlg, UINT message, WPARAM wPar
 
 void win_settings_open(HWND hwnd)
 {
-        DialogBox(hinstance, (LPCWSTR)DLG_CONFIG, hwnd, win_settings_main_proc);
+        DialogBox(hinstance, (LPCWSTR)DLG_CFG_MAIN, hwnd, win_settings_main_proc);
 }
diff --git a/src/disc.c b/src/disc.c
index 015f4ff11..bdede24ed 100644
--- a/src/disc.c
+++ b/src/disc.c
@@ -247,22 +247,22 @@ void disc_poll(int drive)
         }
 }
 
-void disc_poll_0()
+void disc_poll_0(void *priv)
 {
 	disc_poll(0);
 }
 
-void disc_poll_1()
+void disc_poll_1(void *priv)
 {
 	disc_poll(1);
 }
 
-void disc_poll_2()
+void disc_poll_2(void *priv)
 {
 	disc_poll(2);
 }
 
-void disc_poll_3()
+void disc_poll_3(void *priv)
 {
 	disc_poll(3);
 }
diff --git a/src/disc.h b/src/disc.h
index b065b4b53..eb5c7a1bd 100644
--- a/src/disc.h
+++ b/src/disc.h
@@ -51,8 +51,10 @@ extern void	disc_close(int drive);
 extern void	disc_init(void);
 extern void	disc_reset(void);
 extern void	disc_poll(int drive);
-extern void	disc_poll_0(void);
-extern void	disc_poll_1(void);
+extern void	disc_poll_0(void* priv);
+extern void	disc_poll_1(void* priv);
+extern void	disc_poll_2(void* priv);
+extern void	disc_poll_3(void* priv);
 extern void	disc_seek(int drive, int track);
 extern void	disc_readsector(int drive, int sector, int track,
 				int side, int density, int sector_size);
@@ -68,7 +70,7 @@ extern void	disc_stop(int drive);
 extern int	disc_empty(int drive);
 extern void	disc_set_rate(int drive, int drvden, int rate);
 
-extern void	fdc_callback(void);
+extern void	fdc_callback(void *priv);
 extern int	fdc_data(uint8_t dat);
 extern void	fdc_spindown(void);
 extern void	fdc_finishread(void);
diff --git a/src/fdc.c b/src/fdc.c
index eed50ca13..e7f110440 100644
--- a/src/fdc.c
+++ b/src/fdc.c
@@ -150,7 +150,7 @@ int disctime;
 
 static FDC fdc;
 
-void fdc_callback();
+void fdc_callback(void *priv);
 int timetolive;
 int lastbyte=0;
 uint8_t disc_3f7;
@@ -848,7 +848,7 @@ void fdc_write(uint16_t addr, uint8_t val, void *priv)
                                 fdc.lastdrive = fdc.drive;
                                 discint = 8;
                                 fdc.pos = 0;
-                                fdc_callback();
+                                fdc_callback(NULL);
                                 break;
                                 case 10: /*Read sector ID*/
                                 fdc.pnum=0;
@@ -874,13 +874,13 @@ void fdc_write(uint16_t addr, uint8_t val, void *priv)
                                 fdc.lastdrive = fdc.drive;
                                 discint = 0x0e;
                                 fdc.pos = 0;
-                                fdc_callback();
+                                fdc_callback(NULL);
                                 break;
                                 case 0x10: /*Get version*/
                                 fdc.lastdrive = fdc.drive;
                                 discint = 0x10;
                                 fdc.pos = 0;
-                                fdc_callback();
+                                fdc_callback(NULL);
                                 break;
                                 case 0x12: /*Set perpendicular mode*/
 				if (!AT || fdc.pcjr || fdc.ps1)  goto bad_command;
@@ -900,7 +900,7 @@ void fdc_write(uint16_t addr, uint8_t val, void *priv)
                                 fdc.lastdrive = fdc.drive;
                                 discint = fdc.command;
                                 fdc.pos = 0;
-                                fdc_callback();
+                                fdc_callback(NULL);
                                 break;
 
                                 case 0x18:
@@ -908,10 +908,10 @@ void fdc_write(uint16_t addr, uint8_t val, void *priv)
                                 fdc.lastdrive = fdc.drive;
                                 discint = 0x10;
                                 fdc.pos = 0;
-                                fdc_callback();
+                                fdc_callback(NULL);
                                 /* fdc.stat = 0x10;
                                 discint  = 0xfc;
-                                fdc_callback(); */
+                                fdc_callback(NULL); */
                                 break;
 
                                 default:
@@ -1473,7 +1473,7 @@ void fdc_no_dma_end(int compare)
 	fdc_poll_common_finish(compare, 0x80);
 }
 
-void fdc_callback()
+void fdc_callback(void *priv)
 {
 	int compare = 0;
 	int drive_num = 0;
@@ -2000,7 +2000,7 @@ void fdc_track_finishread(int condition)
 	fdc.stat = 0x10;
 	fdc.satisfying_sectors |= condition;
         fdc.inread = 0;
-	fdc_callback();
+	fdc_callback(NULL);
 }
 
 void fdc_sector_finishcompare(int satisfying)
@@ -2008,14 +2008,14 @@ void fdc_sector_finishcompare(int satisfying)
 	fdc.stat = 0x10;
 	fdc.satisfying_sectors++;
         fdc.inread = 0;
-	fdc_callback();
+	fdc_callback(NULL);
 }
 
 void fdc_sector_finishread()
 {
 	fdc.stat = 0x10;
         fdc.inread = 0;
-	fdc_callback();
+	fdc_callback(NULL);
 }
 
 /* There is no sector ID. */