diff --git a/src/device/keyboard.c b/src/device/keyboard.c
index 38d65b408..197281992 100644
--- a/src/device/keyboard.c
+++ b/src/device/keyboard.c
@@ -66,6 +66,7 @@ static uint8_t
 fake_shift_needed(uint16_t scan)
 {
     switch (scan) {
+        case 0x137:    /* Yes, Print Screen requires the fake shifts. */
         case 0x147:
         case 0x148:
         case 0x149:
diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c
index 86e87cc9b..103732f92 100644
--- a/src/device/keyboard_at.c
+++ b/src/device/keyboard_at.c
@@ -735,7 +735,7 @@ add_to_kbc_queue_front(atkbd_t *dev, uint8_t val, uint8_t channel, uint8_t stat_
     else
         stat_hi |= 0x10;
 
-    kbd_log("ATkbc: Adding %02X to front...\n", val);
+    kbd_log("ATkbc: Adding %02X to front on channel %i...\n", val, channel);
     dev->status = (dev->status & ~0xf0) | STAT_OFULL | stat_hi;
 
     /* WARNING: On PS/2, all IRQ's are level-triggered, but the IBM PS/2 KBC firmware is explicitly
@@ -806,6 +806,9 @@ add_data_kbd_front(atkbd_t *dev, uint8_t val)
 static void
 add_data_kbd_raw(atkbd_t *dev, uint8_t val)
 {
+    if (dev->reset_delay)
+        return;
+
     add_data_kbd_cmd_queue(dev, val);
 }
 
@@ -1342,7 +1345,7 @@ add_data_kbd(uint16_t val)
     }
 
     /* Skip break code if translated make code has bit 7 set. */
-    if (translate && (sc_or == 0x80) && (val & 0x80)) {
+    if (translate && (sc_or == 0x80) && (nont_to_t[val] & 0x80)) {
         kbd_log("ATkbd: translate is on, skipping scan code: %02X (original: F0 %02X)\n", nont_to_t[val], val);
         sc_or = 0;
         return;
diff --git a/src/machine/m_at_386dx_486.c b/src/machine/m_at_386dx_486.c
index ee54758e2..7768202da 100644
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -404,7 +404,7 @@ machine_at_acerv10_init(const machine_t *model)
     machine_at_common_init(model);
 
     device_add(&sis_85c461_device);
-    device_add(&keyboard_ps2_ami_pci_device);
+    device_add(&keyboard_ps2_acer_pci_device);
     device_add(&ide_isa_2ch_device);
 
     if (fdc_type == FDC_INTERNAL)