diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index 1e3a57310..f4d55282e 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -390,6 +390,7 @@ void SetDefaultKeyMap(DefaultMaps dmap, bool replace) {
 	case DEFAULT_MAPPING_BLACKBERRY_QWERTY:
 		SetDefaultKeyMap(DEVICE_ID_KEYBOARD, defaultBlackberryQWERTYKeyMap, ARRAY_SIZE(defaultBlackberryQWERTYKeyMap), replace);
 		replace = false;
+		// Intentional fallthrough.
 	case DEFAULT_MAPPING_PAD:
 		SetDefaultKeyMap(DEVICE_ID_PAD_0, defaultPadMap, ARRAY_SIZE(defaultPadMap), replace);
 		break;
diff --git a/UI/CwCheatScreen.h b/UI/CwCheatScreen.h
index 3f3dbcb85..d08e6e160 100644
--- a/UI/CwCheatScreen.h
+++ b/UI/CwCheatScreen.h
@@ -64,11 +64,11 @@ public:
 	virtual void Draw(UIContext &dc);
 
 	UI::EventReturn OnClicked(UI::EventParams &e) {
+		bool temp = false;
 		if (toggle_) {
 			*toggle_ = !(*toggle_);
+			temp = *toggle_;
 		}
-		bool temp;
-		temp = *toggle_;
 		if (temp) {
 			activatedCheat = text_;
 			processFileOn(activatedCheat);