diff --git a/src/disk/hdc.c b/src/disk/hdc.c
index a7e045675..a63573823 100644
--- a/src/disk/hdc.c
+++ b/src/disk/hdc.c
@@ -90,12 +90,11 @@ static const struct {
     /* VLB */
     { &ide_ali5213_device                   },
     { &ide_cmd640_vlb_device                },
-    { &ide_opti611_vlb_device               },
     { &ide_vlb_device                       },
     { &ide_vlb_2ch_device                   },
+    { &ide_opti611_vlb_device               },
     /* PCI */
     { &ide_cmd640_pci_device                },
-    { &ide_cmd640_pci_single_channel_device },
     { &ide_cmd646_ter_qua_device            },
     { &ide_cmd648_ter_qua_device            },
     { &ide_cmd649_ter_qua_device            },
diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index 5a4df85dd..6e2c88a44 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -111,6 +111,7 @@ static fdc_cards_t fdc_cards[] = {
     { &fdc_xt_umc_um8398_device  },
     { &fdc_at_device             },
     { &fdc_at_nsc_dp8473_device  },
+    { &fdc_at_nsc_device         }, /* TODO: PC87311 SIO & floppy controller */
     { &fdc_at_smc_device         },
     { &fdc_b215_device           },
     { &fdc_pii151b_device        },