diff --git a/Makefile.ctr b/Makefile.ctr
index c7ef0cdaf8..8191bde970 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -79,7 +79,7 @@ else
 endif
 
 ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
+	$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
 endif
 
 ifeq ($(strip $(CTRULIB)),)
@@ -136,19 +136,25 @@ LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 CFLAGS   += -std=gnu99 -ffast-math
 
 
-LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lctru -lm
+LIBS	:= $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm
+
+ifeq ($(DEBUG), 1)
+	LIBS	+= -lctrud
+else
+	LIBS	+= -lctru
+endif
 
 
 ifeq ($(BUILD_3DSX), 1)
-TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
+	TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
 endif
 
 ifeq ($(BUILD_3DS), 1)
-TARGET_3DS := $(TARGET).3ds
+	TARGET_3DS := $(TARGET).3ds
 endif
 
 ifeq ($(BUILD_CIA), 1)
-TARGET_CIA := $(TARGET).cia
+	TARGET_CIA := $(TARGET).cia
 endif
 
 .PHONY: $(BUILD) clean all
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index 1deb9c25cb..e1c8fa2a6d 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -327,25 +327,25 @@ static void frontend_ctr_init(void *data)
    gfxInit(GSP_BGR8_OES,GSP_RGB565_OES,false);
 
    u32 topSize = 400 * 240 * 3;
-	u32 bottomSize = 320 * 240 * 2;
+   u32 bottomSize = 320 * 240 * 2;
    linearFree(gfxTopLeftFramebuffers[0]);
-	linearFree(gfxTopLeftFramebuffers[1]);
-	linearFree(gfxBottomFramebuffers[0]);
-	linearFree(gfxBottomFramebuffers[1]);
-	linearFree(gfxTopRightFramebuffers[0]);
-	linearFree(gfxTopRightFramebuffers[1]);
+   linearFree(gfxTopLeftFramebuffers[1]);
+   linearFree(gfxBottomFramebuffers[0]);
+   linearFree(gfxBottomFramebuffers[1]);
+   linearFree(gfxTopRightFramebuffers[0]);
+   linearFree(gfxTopRightFramebuffers[1]);
 
-	gfxTopLeftFramebuffers[0]=linearAlloc(topSize * 2);
-	gfxTopRightFramebuffers[0] = gfxTopLeftFramebuffers[0] + topSize;
+   gfxTopLeftFramebuffers[0]=linearAlloc(topSize * 2);
+   gfxTopRightFramebuffers[0] = gfxTopLeftFramebuffers[0] + topSize;
 
    gfxTopLeftFramebuffers[1]=linearAlloc(topSize * 2);
    gfxTopRightFramebuffers[1] = gfxTopLeftFramebuffers[1] + topSize;
 
    gfxBottomFramebuffers[0]=linearAlloc(bottomSize);
-	gfxBottomFramebuffers[1]=linearAlloc(bottomSize);
+   gfxBottomFramebuffers[1]=linearAlloc(bottomSize);
 
    gfxSetFramebufferInfo(GFX_TOP, 0);
-	gfxSetFramebufferInfo(GFX_BOTTOM, 0);
+   gfxSetFramebufferInfo(GFX_BOTTOM, 0);
 
    gfxSet3D(true);
    consoleInit(GFX_BOTTOM, NULL);
diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c
index d9b83d3579..6c10110edc 100644
--- a/libretro-common/features/features_cpu.c
+++ b/libretro-common/features/features_cpu.c
@@ -486,6 +486,7 @@ unsigned cpu_features_get_core_amount(void)
 			return 2;
 	   
 		case 2:
+		case 4:
 		case 5:
 			/*New 3/2DS*/
 			return 4;
diff --git a/libretro-common/net/net_compat.c b/libretro-common/net/net_compat.c
index a7155cc3a1..1c3e6a3508 100644
--- a/libretro-common/net/net_compat.c
+++ b/libretro-common/net/net_compat.c
@@ -321,11 +321,9 @@ bool network_init(void)
     _net_compat_net_memory = (u32*)memalign(SOC_ALIGN, SOC_BUFFERSIZE);
 	if (_net_compat_net_memory == NULL)
 		return false;
-	//RARCH_LOG("Wifi Buffer at: [0x%08X]\n", (u32)_net_compat_net_memory);
 	Result ret = socInit(_net_compat_net_memory, SOC_BUFFERSIZE);//WIFI init
 	if (ret != 0)
 		return false;
-	//RARCH_LOG("Socket Status: [0x%08X]\n", (uint32_t)ret);
 #else
    signal(SIGPIPE, SIG_IGN); /* Do not like SIGPIPE killing our app. */
 #endif