diff --git a/Makefile.griffin b/Makefile.griffin
index 688b420a99..792bd15eb0 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -106,9 +106,9 @@ ifeq ($(USBGECKO), 1)
 endif
   APP_BOOTER_DIR = wii/app_booter
   PLATOBJS := $(APP_BOOTER_DIR)/app_booter.binobj
-  PLATCFLAGS := -DGEKKO
+  CFLAGS += -DGEKKO
 ifeq ($(USBGECKO), 1)
-  PLATCFLAGS += -DUSBGECKO
+  CFLAGS += -DUSBGECKO
 endif
 
   HAVE_FILTERS_BUILTIN     := 1
diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c
index d70a8faa22..647554ddde 100644
--- a/gfx/drivers/gx_gfx.c
+++ b/gfx/drivers/gx_gfx.c
@@ -1082,10 +1082,10 @@ static bool gx_frame(void *data, const void *frame,
          convert_texture16(gx->menu_data, menu_tex.data,
                menu->frame_buf.width,
                menu->frame_buf.height,
-               menu->frame_buf.width * 2);
+               menu->frame_buf.pitch);
          DCFlushRange(menu_tex.data,
                menu->frame_buf.width * 
-               menu->frame_buf.height * 2);
+               menu->frame_buf.pitch);
       }
    }