diff --git a/source/channel/nand.cpp b/source/channel/nand.cpp
index 580de1f3..c8b88456 100644
--- a/source/channel/nand.cpp
+++ b/source/channel/nand.cpp
@@ -51,8 +51,6 @@ config_header *cfg_hdr;
 bool tbdec = false;
 bool configloaded = false;
 
-static const int d2xfatrepl_len = 7;
-
 static NandDevice NandDeviceList[] = 
 {
 	{ "Disable",						0,	0x00,	0x00 },
diff --git a/source/loader/disc.c b/source/loader/disc.c
index 780245a2..b063de41 100644
--- a/source/loader/disc.c
+++ b/source/loader/disc.c
@@ -255,8 +255,8 @@ s32 Disc_Open(void)
 	/* Read disc ID */
 	ret = WDVD_ReadDiskId(diskid);
 
-	/* Directly set Audio Streaming for GC */
-	gprintf("Setting Audio Streaming for GC Games: 0x%08x\n", WDVD_SetStreaming());
+	/* Directly set Audio Streaming for GC But not here ;) */
+	//gprintf("Setting Audio Streaming for GC Games: 0x%08x\n", WDVD_SetStreaming());
 
 	return ret;
 }
diff --git a/source/loader/splits.c b/source/loader/splits.c
index e3a7c919..4ccf4c76 100644
--- a/source/loader/splits.c
+++ b/source/loader/splits.c
@@ -32,7 +32,7 @@ void split_get_fname(split_info_t *s, int idx, char *fname)
 	strcpy(fname, s->fname);
 	if (idx == 0 && s->create_mode)
 	{
-		strcat(fname, ".tmp");
+		//strcat(fname, ".tmp");
 	}
 	else if (idx > 0)
 	{
diff --git a/source/loader/wbfs_ext.c b/source/loader/wbfs_ext.c
index 1d837cc8..6ab4d407 100644
--- a/source/loader/wbfs_ext.c
+++ b/source/loader/wbfs_ext.c
@@ -167,11 +167,11 @@ s32 WBFS_Ext_RemoveGame(u8 *discid, char *gamepath)
 		if (ent->d_name[0] == '.') continue;
 
 		snprintf(file, sizeof(file), "%s/%s", folder, ent->d_name);
-		if(discid != NULL && strstr(file, (char*)discid) != NULL)
+		//if(discid != NULL && strstr(file, (char*)discid) != NULL)
 			remove(file);
 	}
 	closedir(dir_iter);
-	if(strlen(folder) > 11)
+	//if(strlen(folder) > 11)
 		unlink(folder);
 	return 0;
 }
@@ -214,7 +214,7 @@ s32 WBFS_Ext_AddGame(progress_callback_t spinner, void *spinner_data)
 	}
 
 	wbfs_t *part = wbfs_open_partition(split_read_sector, split_write_sector,
-									&split, sector_size, n_sector, 0, 1);
+									&split, 512, n_sector, 0, 1);
 	if (!part)
 	{
 		split_close(&split);
diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp
index d2bee610..172ca499 100644
--- a/source/menu/menu_game.cpp
+++ b/source/menu/menu_game.cpp
@@ -1,5 +1,4 @@
 
-//#define ENABLEDUMPER
 
 #include "menu.hpp"
 #include "loader/patchcode.h"
@@ -1044,6 +1043,7 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
 			else
 			{
 				/* Read GC disc header */
+				gprintf("Setting Audio Streaming for GC Games: 0x%08x\n", WDVD_SetStreaming());
 				struct gc_discHdr *gcHeader = (struct gc_discHdr *)MEM2_alloc(sizeof(struct gc_discHdr));
 				Disc_ReadGCHeader(gcHeader);
 				memcpy(hdr->hdr.id, gcHeader->id, 6);