diff --git a/src/cpu/386_common.h b/src/cpu/386_common.h
index 42a936358..1273e43b7 100644
--- a/src/cpu/386_common.h
+++ b/src/cpu/386_common.h
@@ -451,41 +451,41 @@ getquad(void)
 }
 
 #ifdef OPS_286_386
-static __inline uint8_t geteab()
+static __inline uint8_t geteab(void)
 {
     if (cpu_mod == 3)
         return (cpu_rm & 4) ? cpu_state.regs[cpu_rm & 3].b.h : cpu_state.regs[cpu_rm&3].b.l;
     return readmemb(easeg, cpu_state.eaaddr);
 }
 
-static __inline uint16_t geteaw()
+static __inline uint16_t geteaw(void)
 {
     if (cpu_mod == 3)
         return cpu_state.regs[cpu_rm].w;
     return readmemw(easeg, cpu_state.eaaddr);
 }
 
-static __inline uint32_t geteal()
+static __inline uint32_t geteal(void)
 {
     if (cpu_mod == 3)
         return cpu_state.regs[cpu_rm].l;
     return readmeml(easeg, cpu_state.eaaddr);
 }
 
-static __inline uint64_t geteaq()
+static __inline uint64_t geteaq(void)
 {
     return readmemq(easeg, cpu_state.eaaddr);
 }
 
-static __inline uint8_t geteab_mem()
+static __inline uint8_t geteab_mem(void)
 {
     return readmemb(easeg,cpu_state.eaaddr);
 }
-static __inline uint16_t geteaw_mem()
+static __inline uint16_t geteaw_mem(void)
 {
     return readmemw(easeg,cpu_state.eaaddr);
 }
-static __inline uint32_t geteal_mem()
+static __inline uint32_t geteal_mem(void)
 {
     return readmeml(easeg,cpu_state.eaaddr);
 }
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 9347ae064..d045d8aaa 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -754,7 +754,7 @@ cpu_set(void)
 #else
             x86_setopcodes(ops_186, ops_186_0f);
 #endif
-            x86_setopcodes_2386(ops_2386_286, ops_2386_286_0f);
+            x86_setopcodes_2386(ops_2386_186, ops_2386_186_0f);
             break;
 
         case CPU_286:
@@ -763,6 +763,7 @@ cpu_set(void)
 #else
             x86_setopcodes(ops_286, ops_286_0f);
 #endif
+            x86_setopcodes_2386(ops_2386_286, ops_2386_286_0f);
 
             if (fpu_type == FPU_287) {
 #ifdef USE_DYNAREC
diff --git a/src/cpu/x86_ops_mov.h b/src/cpu/x86_ops_mov.h
index 063a33516..84239be07 100644
--- a/src/cpu/x86_ops_mov.h
+++ b/src/cpu/x86_ops_mov.h
@@ -769,6 +769,7 @@ opMOV_r_l_a32(uint32_t fetchdat)
     return 0;
 }
 
+#ifndef OPS_286_386
 #define opCMOV(condition)                                                             \
     static int opCMOV##condition##_w_a16(uint32_t fetchdat)                           \
     {                                                                                 \
@@ -865,3 +866,4 @@ opCMOV(NL)
 opCMOV(LE)
 opCMOV(NLE)
 // clang-format on
+#endif