diff --git a/Core/CwCheat.cpp b/Core/CwCheat.cpp
index e175aadc5b..f60542373e 100644
--- a/Core/CwCheat.cpp
+++ b/Core/CwCheat.cpp
@@ -16,9 +16,6 @@ void hleCheat(u64 userdata, int cyclesLate);
 void trim2(std::string& str);
 
 void __CheatInit() {
-	//Moved createFullPath to CheatInit from the constructor because it spams the log and constantly checks if exists. In here, only checks once.
-
-	// Cheats aren't working on Android yet - need to figure out the directory structure
 	gameTitle = g_paramSFO.GetValueString("DISC_ID");
 #ifdef ANDROID
 	activeCheatFile = g_Config.memCardDirectory + "PSP/Cheats/" + gameTitle + ".ini";
@@ -195,7 +192,9 @@ std::vector<std::string> CWCheatEngine::GetCodesList() { //Reads the entire chea
 	std::ifstream list(activeCheatFile.c_str());
 	for (int i = 0; !list.eof(); i ++) {
 		getline(list, line, '\n');
-		codesList.push_back(line);
+		if (line.length() > 8){
+			codesList.push_back(line);
+		}
 	}
 	for(size_t i = 0; i < codesList.size(); i++) {
 		trim2(codesList[i]);
@@ -506,6 +505,10 @@ void CWCheatEngine::Run() {
 					}
 					break;
 				}
+			default:
+				{
+					break;
+				}
 			}
 		}
 	}
diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h
index 85b85c9022..120271b7a7 100644
--- a/UI/CwCheatScreen.h
+++ b/UI/CwCheatScreen.h
@@ -46,7 +46,7 @@ protected:
 private:
 	UI::EventReturn OnCheckBox(UI::EventParams &params);
 	
-	bool enableCheat [64];
+	bool enableCheat [128];
 	std::vector<std::string> formattedList;
 	std::vector<int> locations;