diff --git a/src/cpu/808x.c b/src/cpu/808x.c
index 3572f2c9f..0b6bd66b5 100644
--- a/src/cpu/808x.c
+++ b/src/cpu/808x.c
@@ -563,9 +563,10 @@ reset_808x(int hard)
         _opseg[3] = &cpu_state.seg_ds;
 
         pfq_size = (is8086) ? 6 : 4;
-        pfq_clear();
     }
 
+    pfq_clear();
+
     load_cs(0xFFFF);
     cpu_state.pc = 0;
     if (is_nec)
diff --git a/src/machine/m_amstrad.c b/src/machine/m_amstrad.c
index 4bc53c9b4..dfeb1fa0f 100644
--- a/src/machine/m_amstrad.c
+++ b/src/machine/m_amstrad.c
@@ -2124,7 +2124,6 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
 
         case 0x66:
             softresetx86();
-            cpu_set_edx();
             break;
 
         default: