diff --git a/src/basic/basic_commands/cmd_go_goto_run.s b/src/basic/basic_commands/cmd_go_goto_run.s
index 8639d57b..96744238 100644
--- a/src/basic/basic_commands/cmd_go_goto_run.s
+++ b/src/basic/basic_commands/cmd_go_goto_run.s
@@ -22,7 +22,7 @@ cmd_go_syntax_error:
 
 	dew TXTPTR                         // unconsume character
 
-	// Fetch mode
+	// Fetch desired mode
 
 	jsr fetch_uint8
 
diff --git a/src/kernal/extapi_m65/mega65_mode65.s b/src/kernal/extapi_m65/mega65_mode65.s
index 100ffeb0..8dd88f24 100644
--- a/src/kernal/extapi_m65/mega65_mode65.s
+++ b/src/kernal/extapi_m65/mega65_mode65.s
@@ -23,6 +23,7 @@ M65_MODE65:
 
 	// Initialize VIC-IV
 
+	jsr setup_vicii
 	jsr viciv_init
 
 	// Set screen mode to 80x50
diff --git a/src/kernal/interrupts/fe66.default_brk_handler.s b/src/kernal/interrupts/fe66.default_brk_handler.s
index 782a0d6b..eb7e2cec 100644
--- a/src/kernal/interrupts/fe66.default_brk_handler.s
+++ b/src/kernal/interrupts/fe66.default_brk_handler.s
@@ -22,6 +22,14 @@ default_brk_handler:
 
 	see                      // disable extended stack
 
+#endif
+
+#if ROM_LAYOUT_M65
+
+	// Make sure we have normal memory mapping
+
+	jsr map_NORMAL
+
 #endif
 
 	jsr JRESTOR
diff --git a/src/kernal/panic.s b/src/kernal/panic.s
index f2a8023a..f214ddee 100644
--- a/src/kernal/panic.s
+++ b/src/kernal/panic.s
@@ -18,8 +18,9 @@ panic:
 
 #if ROM_LAYOUT_M65
 
-	// Make sure we are in legacy mode
+	// Make sure we are in legacy mode with normal memory mapping
 
+	jsr map_NORMAL
 	jsr M65_MODE64
 
 #endif