diff --git a/out/boot.dol b/out/boot.dol
index 15c28c78..9aebf155 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/btnmap.h b/source/btnmap.h
index 77845ec3..7de9be69 100644
--- a/source/btnmap.h
+++ b/source/btnmap.h
@@ -11,9 +11,9 @@
 #define WBTN_HOME_PRESSED (wBtn_Pressed(WPAD_BUTTON_HOME, WPAD_EXP_NONE) \
 		|| wBtn_Pressed(WPAD_CLASSIC_BUTTON_HOME, WPAD_EXP_CLASSIC))
 #define WBTN_MINUS_PRESSED (wBtn_Pressed(WPAD_BUTTON_MINUS, WPAD_EXP_NONE) \
-		|| wBtn_Pressed(WPAD_CLASSIC_BUTTON_FULL_L, WPAD_EXP_CLASSIC))
+		|| wBtn_Pressed(WPAD_CLASSIC_BUTTON_MINUS, WPAD_EXP_CLASSIC))
 #define WBTN_PLUS_PRESSED (wBtn_Pressed(WPAD_BUTTON_PLUS, WPAD_EXP_NONE) \
-		|| wBtn_Pressed(WPAD_CLASSIC_BUTTON_FULL_R, WPAD_EXP_CLASSIC))
+		|| wBtn_Pressed(WPAD_CLASSIC_BUTTON_PLUS, WPAD_EXP_CLASSIC))
 #define WBTN_Z_PRESSED (wBtn_Pressed(WPAD_NUNCHUK_BUTTON_Z, WPAD_EXP_NUNCHUK) \
 		|| wBtn_Pressed(WPAD_CLASSIC_BUTTON_ZR, WPAD_EXP_CLASSIC))
 #define WBTN_A_PRESSED (wBtn_Pressed(WPAD_BUTTON_A, WPAD_EXP_NONE) \
diff --git a/source/homebrew/homebrew.cpp b/source/homebrew/homebrew.cpp
index bea09631..2ccdeecd 100644
--- a/source/homebrew/homebrew.cpp
+++ b/source/homebrew/homebrew.cpp
@@ -95,8 +95,9 @@ bool LoadHomebrew(const char *filepath)
 		DCFlushRange(EXECUTE_ADDR, filesize);
 		homebrew_ptr = (char*)EXECUTE_ADDR;
 		homebrew_size = filesize;
+		return true;
 	}
-	return true;
+	return false;
 }
 
 char *GetHomebrew(unsigned int *size)
@@ -168,7 +169,7 @@ void BootHomebrew()
 
 	memcpy(BOOTER_ADDR, appbooter_ptr, appbooter_size);
 	DCFlushRange(BOOTER_ADDR, appbooter_size);
-
+	free(appbooter_ptr);
 	JumpToEntry(BOOTER_ENTRY);
 }