diff --git a/src/device/isartc.c b/src/device/isartc.c
index 3ba092eb9..0128dff0a 100644
--- a/src/device/isartc.c
+++ b/src/device/isartc.c
@@ -680,11 +680,9 @@ isartc_init(const device_t *info)
 
         case ISARTC_RTC58167: /* Multitech PC-500/PC-500+ onboard RTC */
             dev->flags |= FLAG_YEARBCD;
-            //dev->base_addr   = machine_get_config_int("rtc_port");
-            dev->base_addr   = 0x2c0;
+            dev->base_addr   = machine_get_config_int("rtc_port");
             dev->base_addrsz = 8;
-            //dev->irq         = machine_get_config_int("rtc_irq");
-            dev->irq         = -1;
+            dev->irq         = machine_get_config_int("rtc_irq");
             dev->f_rd        = rtc58167_read;
             dev->f_wr        = rtc58167_write;
             dev->nvr.reset   = mm67_reset;
diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c
index 5969f25c9..007e8c7c4 100644
--- a/src/machine/m_xt.c
+++ b/src/machine/m_xt.c
@@ -1259,7 +1259,7 @@ static const device_config_t pc500_config[] = {
     {
         .name           = "rtc_port",
         .description    = "RTC Port Address",
-        .type           = CONFIG_HEX16,
+        .type           = CONFIG_SELECTION,
         .default_string = NULL,
         .default_int    = 0,
         .file_filter    = NULL,
@@ -1310,7 +1310,7 @@ machine_xt_pc500_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    device_add(&kbc_xtclone_device);
+    device_add(&kbc_pc82_device);
 
     machine_xt_common_init(model, 0);
 
@@ -1379,7 +1379,7 @@ static const device_config_t pc500plus_config[] = {
     {
         .name           = "rtc_port",
         .description    = "Onboard RTC",
-        .type           = CONFIG_HEX16,
+        .type           = CONFIG_SELECTION,
         .default_string = NULL,
         .default_int    = 0,
         .file_filter    = NULL,
@@ -1429,9 +1429,7 @@ machine_xt_pc500plus_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    device_add(&kbc_xtclone_device);
-
-    machine_xt_common_init(model, 0);
+    machine_xt_clone_init(model, 0);
 
     if (rtc_port != 0)
         device_add(&rtc58167_device);
@@ -1507,7 +1505,7 @@ machine_xt_pc700_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    device_add(&kbc_pc_device);
+    device_add(&kbc_pc82_device);
 
     machine_xt_common_init(model, 0);
 
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index d8bdade84..83076edc6 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -1126,7 +1126,7 @@ const machine_t machines[] = {
         .nvrmask                  = 0,
         .jumpered_ecp_dma         = 0,
         .default_jumpered_ecp_dma = -1,
-        .kbc_device               = &kbc_pc_device,
+        .kbc_device               = &kbc_pc82_device,
         .kbc_params               = 0x00000000,
         .kbc_p1                   = 0xff,
         .gpio                     = 0xffffffff,
@@ -1169,7 +1169,7 @@ const machine_t machines[] = {
         .nvrmask                  = 0,
         .jumpered_ecp_dma         = 0,
         .default_jumpered_ecp_dma = -1,
-        .kbc_device               = &kbc_pc_device,
+        .kbc_device               = &kbc_xtclone_device,
         .kbc_params               = 0x00000000,
         .kbc_p1                   = 0xff,
         .gpio                     = 0xffffffff,
@@ -1212,7 +1212,7 @@ const machine_t machines[] = {
         .nvrmask                  = 0,
         .jumpered_ecp_dma         = 0,
         .default_jumpered_ecp_dma = -1,
-        .kbc_device               = &kbc_pc_device,
+        .kbc_device               = &kbc_pc82_device,
         .kbc_params               = 0x00000000,
         .kbc_p1                   = 0xff,
         .gpio                     = 0xffffffff,
diff --git a/src/video/vid_et4000w32.c b/src/video/vid_et4000w32.c
index 4b95ba04e..cd78c555e 100644
--- a/src/video/vid_et4000w32.c
+++ b/src/video/vid_et4000w32.c
@@ -40,7 +40,7 @@
 #define BIOS_ROM_PATH_W32_MACHSPEED_VGA_GUI_2400S   "roms/video/et4000w32/ET4000W32VLB_bios_MX27C512.BIN"
 #define BIOS_ROM_PATH_W32I_REVB_AXIS_MICRODEVICE    "roms/video/et4000w32/ET4KW32I.VBI"
 #define BIOS_ROM_PATH_W32I_REVB_HERCULES_DYNAMITE_VLB_PRO "roms/video/et4000w32/Hercules Dynamite VL Pro v8.00 c 1993 Hercules.bin"
-#define BIOS_ROM_PATH_W32P_REVB_VIDEOMAGIC          "roms/video/et4000w32/VideoMagic-BioS-HXIRTW32PWSRL.bin"
+#define BIOS_ROM_PATH_W32P_REVB_VIDEOMAGIC          "roms/video/et4000w32/VideoMagic-BioS-HXIRTW32PWSRL.BIN"
 #define BIOS_ROM_PATH_W32P_REVC_CARDEX              "roms/video/et4000w32/et4000w32pcardex.BIN"
 #define BIOS_ROM_PATH_W32P_REVD                     "roms/video/et4000w32/ET4K_W32.BIN"
 #define BIOS_ROM_PATH_W32P_REVD_CARDEX              "roms/video/et4000w32/cardex.vbi"
diff --git a/src/video/vid_table.c b/src/video/vid_table.c
index db8b33e18..cb7e794e8 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -327,8 +327,10 @@ video_prepare(void)
 
     for (int i = 0; i < MONITORS_NUM; i++) {
         /* Reset the CGA palette. */
+#if 0
         if (monitors[i].mon_cga_palette)
             *monitors[i].mon_cga_palette = 0;
+#endif
         cgapal_rebuild_monitor(i);
 
         /* Do an inform on the default values, so that that there's some sane values initialized