diff --git a/source/ngc/filesel.cpp b/source/ngc/filesel.cpp
index 6ef465c..eff214e 100644
--- a/source/ngc/filesel.cpp
+++ b/source/ngc/filesel.cpp
@@ -4,7 +4,7 @@
  * softdev July 2006
  * svpe June 2007
  * crunchy2 May-July 2007
-  * Michniewski 2008
+ * Michniewski 2008
  * Tantric August 2008
  *
  * filesel.cpp
@@ -20,12 +20,10 @@
 #include <sys/dir.h>
 
 #ifdef WII_DVD
-#ifdef __cplusplus
 extern "C" {
 #include <di/di.h>
 }
 #endif
-#endif
 
 #include "snes9x.h"
 #include "memmap.h"
diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp
index 115ebd3..702bf93 100644
--- a/source/ngc/menu.cpp
+++ b/source/ngc/menu.cpp
@@ -106,6 +106,9 @@ LoadManager ()
 
 		// setup cheats
 		SetupCheats();
+
+		// reset zoom
+		zoom_reset ();
 	}
 
 	return loadROM;
@@ -564,6 +567,7 @@ GameMenu ()
 				break;
 
 			case 1: // Reset Game
+				zoom_reset ();
 				S9xSoftReset ();
 				quit = retval = 1;
 				break;
@@ -578,6 +582,7 @@ GameMenu ()
 				break;
 
 			case 4: // Load SRAM
+				zoom_reset ();
 				quit = retval = LoadSRAM(GCSettings.SaveMethod, NOTSILENT);
 				break;
 
@@ -586,15 +591,17 @@ GameMenu ()
 				break;
 
 			case 6: // Load Freeze
+				zoom_reset ();
 				quit = retval = NGCUnfreezeGame (GCSettings.SaveMethod, NOTSILENT);
 				break;
 
 			case 7: // Save Freeze
 				NGCFreezeGame (GCSettings.SaveMethod, NOTSILENT);
 				break;
-				
+
 			case 8:	// Reset Zoom
 				zoom_reset ();
+				quit = retval = 1;
 				break;
 
 			case -1: // Button B