diff --git a/Makefile.ctr b/Makefile.ctr
index 44cb99611f..771595e553 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -101,7 +101,7 @@ LD      := $(CXX)
 #---------------------------------------------------------------------------------
 	@echo $(notdir $<)
 	python $(AEMSTRO)/aemstro_as.py $< $(notdir $<).shbin
-	bin2s $(notdir $<).shbin | $(PREFIX)as -o $@
+	$(DEVKITARM)/bin/bin2s $(notdir $<).shbin | $(PREFIX)as -o $@
 	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(notdir $<).shbin | tr . _)`.h
 	echo "extern const u8" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(notdir $<).shbin | tr . _)`.h
 	echo "extern const u32" `(echo $(notdir $<).shbin | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(notdir $<).shbin | tr . _)`.h
diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index 804f4027a3..c891619425 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -166,7 +166,7 @@ static void* ctr_init(const video_info_t* video,
    GPU_DepthMap(-1.0f, 0.0f);
    GPU_SetFaceCulling(GPU_CULL_NONE);
    GPU_SetStencilTest(false, GPU_ALWAYS, 0x00, 0xFF, 0x00);
-   GPU_SetStencilOp(GPU_KEEP, GPU_KEEP, GPU_KEEP);
+   GPU_SetStencilOp(GPU_STENCIL_KEEP, GPU_STENCIL_KEEP, GPU_STENCIL_KEEP);
    GPU_SetBlendingColor(0, 0, 0, 0);
 //      GPU_SetDepthTestAndWriteMask(true, GPU_GREATER, GPU_WRITE_ALL);
    GPU_SetDepthTestAndWriteMask(false, GPU_ALWAYS, GPU_WRITE_ALL);
@@ -332,7 +332,7 @@ static bool ctr_frame(void* data, const void* frame,
 
    ctrGuSetAttributeBuffersAddress(VIRT_TO_PHYS(ctr->frame_coords));
    ctrGuSetVertexShaderFloatUniform(0, (float*)&ctr->scale_vector, 1);
-   GPU_DrawArray(GPU_UNKPRIM, 1);
+   GPU_DrawArray(GPU_UNKPRIM, 0, 1);
 
    if (ctr->menu_texture_enable)
    {
@@ -351,7 +351,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);
-      GPU_DrawArray(GPU_UNKPRIM, 1);
+      GPU_DrawArray(GPU_UNKPRIM, 0, 1);
    }
 
    GPU_FinishDrawing();
diff --git a/input/drivers/ctr_input.c b/input/drivers/ctr_input.c
index 9b6aab30a1..932a63e854 100644
--- a/input/drivers/ctr_input.c
+++ b/input/drivers/ctr_input.c
@@ -88,7 +88,7 @@ static bool ctr_input_key_pressed(void *data, int key)
    settings_t *settings = config_get_ptr();
    ctr_input_t *ctr     = (ctr_input_t*)data;
 
-   return (input_joypad_pressed(ctr->joypad, 0, settings->input.binds[0], key);
+   return input_joypad_pressed(ctr->joypad, 0, settings->input.binds[0], key);
 }
 
 static bool ctr_input_meta_key_pressed(void *data, int key)
diff --git a/libretro-common/include/memmap.h b/libretro-common/include/memmap.h
index ac0f7bedd4..94412a616c 100644
--- a/libretro-common/include/memmap.h
+++ b/libretro-common/include/memmap.h
@@ -23,7 +23,7 @@
 #ifndef _LIBRETRO_MEMMAP_H
 #define _LIBRETRO_MEMMAP_H
 
-#if defined(__CELLOS_LV2__) || defined(PSP) || defined(GEKKO) || defined(VITA) || defined(_XBOX)
+#if defined(__CELLOS_LV2__) || defined(PSP) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS)
 /* No mman available */
 #elif defined(_WIN32) && !defined(_XBOX)
 #include <windows.h>