diff --git a/src/machine/m_xt.c b/src/machine/m_xt.c
index c3904d7ec..d02d9d730 100644
--- a/src/machine/m_xt.c
+++ b/src/machine/m_xt.c
@@ -2016,7 +2016,7 @@ machine_xt_z184_init(const machine_t *model)
     /* So that serial_standalone_init() won't do anything. */
     serial_set_next_inst(SERIAL_MAX - 1);
 
-    device_add(&cga_device);
+    device_add(&v6355d_device);
 
     return ret;
 }
diff --git a/src/scsi/scsi.c b/src/scsi/scsi.c
index 89ea9fc29..79cdcda74 100644
--- a/src/scsi/scsi.c
+++ b/src/scsi/scsi.c
@@ -53,13 +53,13 @@ typedef const struct {
 static SCSI_CARD scsi_cards[] = {
   // clang-format off
     { &device_none,              },
-    /* ISA/Sidecar */
-    { &scsi_ls2000_device,       },
     /* ISA */
     { &scsi_lcs6821n_device,     },
     { &scsi_rt1000b_device,      },
     { &scsi_t128_device,         },
     { &scsi_t130b_device,        },
+    /* ISA/Sidecar */
+    { &scsi_ls2000_device,       },
     /* ISA16 */
     { &aha154xa_device,          },
     { &aha154xb_device,          },
@@ -91,12 +91,12 @@ static SCSI_CARD scsi_cards[] = {
     { &ncr53c825a_pci_device,    },
     { &ncr53c860_pci_device,     },
     { &ncr53c875_pci_device,     },
-    { &dc390_pci_device,         },
     { &qla1040b_device,          },
     { &qla1080_device,           },
     { &qla1240_device,           },
     { &qla1280_device,           },
     { &qla12160a_device,         },
+    { &dc390_pci_device,         },
     { NULL,                      },
   // clang-format on
 };
diff --git a/src/sound/sound.c b/src/sound/sound.c
index af2f958a9..a878b153a 100644
--- a/src/sound/sound.c
+++ b/src/sound/sound.c
@@ -122,11 +122,11 @@ static const SOUND_CARD sound_cards[] = {
     { &ess_ess0102_pnp_device       },
     { &ess_ess0968_pnp_device       },
     { &ssi2001_device               },
+    { &thunderboard_device          },
     { &mmb_device                   },
 #ifdef USE_LIBSERIALPORT /*The following devices required LIBSERIALPORT*/
     { &opl2board_device             },
 #endif
-    { &thunderboard_device          },
     { &pasplus_device               },
     { &sb_1_device                  },
     { &sb_15_device                 },