diff --git a/Makefile.ctr b/Makefile.ctr
index fe3b323885..5c83abbc47 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -28,7 +28,7 @@ CTR_STACK_SIZE        = 0x400000
 else
 CTR_STACK_SIZE        = 0x100000
 endif
-CTR_LINEAR_HEAP_SIZE  = 0x800000
+CTR_LINEAR_HEAP_SIZE  = 0xC00000
 
 include ctr/Makefile.cores
 
@@ -202,7 +202,6 @@ else
 	OBJS += menu/cbs/menu_cbs_deferred_push.o
 	OBJS += menu/cbs/menu_cbs_scan.o
 	OBJS += menu/cbs/menu_cbs_get_value.o
-	OBJS += menu/menu_iterate.o
 	OBJS += menu/cbs/menu_cbs_up.o
 	OBJS += menu/cbs/menu_cbs_down.o
 	OBJS += menu/cbs/menu_cbs_contentlist_switch.o
@@ -221,6 +220,7 @@ else
 	OBJS += menu/intl/menu_hash_pt.o
 	OBJS += menu/intl/menu_hash_us.o
 	OBJS += menu/drivers/null.o
+   OBJS += menu/drivers/menu_generic.o
 	OBJS += menu/drivers/rgui.o
 	OBJS += command_event.o
 	OBJS += deps/zlib/adler32.o
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index 24bc16475a..0288e287bb 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -39,9 +39,10 @@
 
 const char* elf_path_cst = "sdmc:/retroarch/test.3dsx";
 
+#ifndef DEBUG_HOLD
 void wait_for_input(void);
-
 #define DEBUG_HOLD() do{printf("%s@%s:%d.\n",__FUNCTION__, __FILE__, __LINE__);fflush(stdout);wait_for_input();}while(0)
+#endif
 
 #define CTR_APPMEMALLOC_PTR ((u32*)0x1FF80040)
 
diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index 21fc71857e..14b2a124cc 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -238,7 +238,7 @@ static void* ctr_init(const video_info_t* video,
    ctr->display_list = linearAlloc(ctr->display_list_size * sizeof(uint32_t));
    GPU_Reset(NULL, ctr->display_list, ctr->display_list_size);
 
-   ctr->texture_width = 512;
+   ctr->texture_width = 1024;
    ctr->texture_height = 512;
    ctr->texture_linear =
          linearMemAlign(ctr->texture_width * ctr->texture_height * sizeof(uint32_t), 128);
@@ -518,7 +518,7 @@ static bool ctr_frame(void* data, const void* frame,
 
 
       ctrGuSetAttributeBuffersAddress(VIRT_TO_PHYS(ctr->menu.frame_coords));
-      ctrGuSetVertexShaderFloatUniform(1, (float*)&ctr->menu.scale_vector, 1);
+      ctrGuSetVertexShaderFloatUniform(0, (float*)&ctr->menu.scale_vector, 1);
       GPU_DrawArray(GPU_UNKPRIM, 0, 1);
    }
 
diff --git a/gfx/drivers/ctr_gu.h b/gfx/drivers/ctr_gu.h
index 4721e46a4c..92a5ef22be 100644
--- a/gfx/drivers/ctr_gu.h
+++ b/gfx/drivers/ctr_gu.h
@@ -51,6 +51,11 @@
 #define CTR_CPU_TICKS_PER_SECOND    268123480
 #define CTR_CPU_TICKS_PER_FRAME     4481134
 
+#ifndef DEBUG_HOLD
+void wait_for_input(void);
+#define DEBUG_HOLD() do{printf("%s@%s:%d.\n",__FUNCTION__, __FILE__, __LINE__);fflush(stdout);wait_for_input();}while(0)
+#endif
+
 
 extern Handle gspEvents[GSPEVENT_MAX];
 extern u32* gpuCmdBuf;