diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index 4cfa7447e..9e527e8c3 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -671,25 +671,26 @@ machine_at_pb450_init(const machine_t *model)
     if (bios_only || !ret)
         return ret;
 
-    machine_at_common_init(model);
+    machine_at_common_init_ex(model, 2);
+    device_add(&ide_vlb_2ch_device);
 
     pci_init(PCI_CONFIG_TYPE_1);
     pci_register_slot(0x10, PCI_CARD_NORTHBRIDGE, 0, 0, 0, 0);
-    pci_register_slot(0x11, PCI_CARD_NORMAL,      5, 4, 3, 2);
-    pci_register_slot(0x12, PCI_CARD_NORMAL,      9, 8, 7, 6);
-
-    device_add(&opti895_device);
-    device_add(&opti822_device);
-    device_add(&keyboard_ps2_intel_ami_pci_device);
-    device_add(&fdc37c661_ide_device);
-    device_add(&ide_opti611_vlb_sec_device);
-    device_add(&ide_vlb_2ch_device);
-    device_add(&intel_flash_bxt_device);
-    device_add(&phoenix_486_jumper_pci_device);
+    pci_register_slot(0x11, PCI_CARD_NORMAL,      1, 2, 3, 4);
+    pci_register_slot(0x12, PCI_CARD_NORMAL,      5, 6, 7, 8);
 
     if (gfxcard[0] == VID_INTERNAL)
         device_add(&gd5428_vlb_onboard_device);
 
+    device_add(&opti602_device);
+    device_add(&opti895_device);
+    device_add(&opti822_device);
+    device_add(&keyboard_ps2_ami_device);
+    device_add(&fdc37c661_ide_device);
+    device_add(&ide_opti611_vlb_sec_device);
+    device_add(&intel_flash_bxt_device);
+    device_add(&phoenix_486_jumper_pci_device);
+
     return ret;
 }
 
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 04cc59043..9a7161c7f 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -6438,7 +6438,7 @@ const machine_t machines[] = {
             .max = 65536,
             .step = 1024
         },
-        .nvrmask = 127,
+        .nvrmask = 255,
         .kbc_device = NULL,
         .kbc_p1 = 0xff,
         .gpio = 0xffffffff,