diff --git a/Makefile.gc b/Makefile.gc
index 217293b..62f694d 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -31,7 +31,7 @@ LANG		:=	ENGLISH
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-CFLAGS  = -g -Os -Wall $(MACHDEP) $(INCLUDE) -DFCEU_VERSION_NUMERIC=9812 -DNGC=1 \
+CFLAGS  = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -DFCEU_VERSION_NUMERIC=9812 -DNGC=1 \
 		-DZLIB -DBIG_ENDIAN -DHAVE_ASPRINTF=1 -DSTDC \
 	    -D_SZ_ONE_DIRECTORY=1 -D_LZMA_IN_CB=1 -D_LZMA_OUT_READ \
 	    -DINTL_$(LANG)
diff --git a/Makefile.wii b/Makefile.wii
index a58db79..9f6f44d 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -31,7 +31,7 @@ LANG		:=	ENGLISH
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-CFLAGS  = -g -Os -Wall $(MACHDEP) $(INCLUDE) -DFCEU_VERSION_NUMERIC=9812 -DNGC=1 \
+CFLAGS  = -g -O2 -Wall $(MACHDEP) $(INCLUDE) -DFCEU_VERSION_NUMERIC=9812 -DNGC=1 \
 		-DZLIB -DBIG_ENDIAN -DWORDS_BIGENDIAN -DHAVE_ASPRINTF=1 -DSTDC \
 	    -DWII_DVD -D_SZ_ONE_DIRECTORY=1 -D_LZMA_IN_CB=1 -D_LZMA_OUT_READ \
 	    -DINTL_$(LANG)
diff --git a/source/ngc/menu.c b/source/ngc/menu.c
index c6339a3..94bdaa9 100644
--- a/source/ngc/menu.c
+++ b/source/ngc/menu.c
@@ -589,7 +589,7 @@ ConfigureButtons (u16 ctrlr_type)
 	while (quit == 0)
 	{
 		/*** Update Menu with Current ButtonMap ***/
-		for (i=0; i<8; i++) // nes pad has 12 buttons to config (go thru them)
+		for (i=0; i<8; i++) // nes pad has 8 buttons to config (go thru them)
 		{
 			// get current padmap button name to display
 			for ( j=0;