diff --git a/src/machine/m_at_386sx.c b/src/machine/m_at_386sx.c
index e225ba0e7..f48b8977a 100644
--- a/src/machine/m_at_386sx.c
+++ b/src/machine/m_at_386sx.c
@@ -408,6 +408,7 @@ machine_at_cmdsl386sx16_init(const machine_t *model)
         device_add(&fdc_at_device);
 
     device_add(&neat_device);
+    device_add(&ide_isa_device);
     /* Two serial ports - on the real hardware SL386SX-16, they are on the single UMC UM82C452. */
     device_add_inst(&ns16450_device, 1);
     device_add_inst(&ns16450_device, 2);
diff --git a/src/machine/m_at_socket1.c b/src/machine/m_at_socket1.c
index f2d75fd72..ab0fadb1a 100644
--- a/src/machine/m_at_socket1.c
+++ b/src/machine/m_at_socket1.c
@@ -115,6 +115,9 @@ machine_at_svc486wb_init(const machine_t *model)
     device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&ide_isa_device);
 
+    if (fdc_current[0] == FDC_INTERNAL)
+        device_add(&fdc_at_device);
+
     return ret;
 }
 
diff --git a/src/machine/m_at_socket3_pci.c b/src/machine/m_at_socket3_pci.c
index 3182537c1..74060ea03 100644
--- a/src/machine/m_at_socket3_pci.c
+++ b/src/machine/m_at_socket3_pci.c
@@ -588,7 +588,7 @@ machine_at_sb486p_init(const machine_t *model)
 
     device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
-    device_add_params(&i82091aa_device, (void *) I82091AA_022);
+    device_add_params(&i82091aa_device, (void *) I82091AA_26E);
     device_add(&i420ex_device);
 
     return ret;
@@ -1211,6 +1211,7 @@ machine_at_ecs486_init(const machine_t *model)
     device_add_params(&fdc37c6xx_device, (void *) FDC37C665);
     device_add(&intel_flash_bxt_device);
 
+    machine_force_ps2(1);
     device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
 
     return ret;
@@ -1387,7 +1388,7 @@ machine_at_hot433a_init(const machine_t *model)
         return ret;
 
     device_context(model->device);
-    int is_award = !strcmp(device_get_config_bios("bios"), "hot433a_award");
+    int is_award = !strcmp(device_get_config_bios("bios"), "hot433a_v451pg");
     fn = device_get_bios_file(machine_get_device(machine), device_get_config_bios("bios"), 0);
     ret = bios_load_linear(fn, 0x000e0000, 131072, 0);
     device_context_restore();
diff --git a/src/machine/m_at_socket5.c b/src/machine/m_at_socket5.c
index ebe565b6e..a55e2bc2d 100644
--- a/src/machine/m_at_socket5.c
+++ b/src/machine/m_at_socket5.c
@@ -249,6 +249,7 @@ machine_at_tek932_init(const machine_t *model)
     pci_register_slot(0x0E, PCI_CARD_NORMAL,      3, 4, 1, 2);
     pci_register_slot(0x0D, PCI_CARD_NORMAL,      4, 1, 2, 3);
     pci_register_slot(0x0C, PCI_CARD_NORMAL,      1, 3, 2, 4);
+    machine_force_ps2(1);
     device_add_params(machine_get_kbc_device(machine), (void *) model->kbc_params);
     device_add(&i430nx_device);
     device_add(&sio_zb_device);
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 1498c3b1c..7648c7888 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -12053,7 +12053,7 @@ const machine_t machines[] = {
             .max_multi = 1.5
         },
         .bus_flags = MACHINE_PCI,
-        .flags = MACHINE_IDE | MACHINE_APM,
+        .flags = MACHINE_PS2_KBC | MACHINE_IDE | MACHINE_APM,
         .ram = {
             .min = 2048,
             .max = 262144,