--- hatari/src/uae-cpu/hatari-glue.c	2019/04/09 08:57:02	1.1.1.21
+++ hatari/src/uae-cpu/hatari-glue.c	2019/04/09 08:59:34	1.1.1.22
@@ -111,6 +111,7 @@ int Init680x0(void)
 	currprefs.address_space_24 = changed_prefs.address_space_24 = true;
 
 	init_m68k();
+	Cart_PatchCpuTables();
 
 	return true;
 }
@@ -152,6 +153,7 @@ void check_prefs_changed_cpu(void)
 		currprefs.cpu_compatible = changed_prefs.cpu_compatible;
 		set_special(SPCFLAG_MODE_CHANGE);
 		build_cpufunctbl ();
+		Cart_PatchCpuTables();
 	}
 }
 
@@ -193,6 +195,11 @@ unsigned long OpCode_SysInit(uae_u32 opc
 
 		CpuDoNOP ();
 	}
+	else if (!bUseTos)
+	{
+		GemDOS_Boot();
+		CpuDoNOP();
+	}
 	else
 	{
 		LOG_TRACE(TRACE_OS_GEMDOS | TRACE_OS_BASE | TRACE_OS_VDI | TRACE_OS_AES,