diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index d4bc5ab3dd..924ad60ecd 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -56,7 +56,6 @@ namespace MainWindow {
 	extern HINSTANCE hInst;
 	extern bool noFocusPause;
 	static W32Util::AsyncBrowseDialog *browseDialog;
-	static W32Util::AsyncBrowseDialog *browseImageDialog;
 	static bool browsePauseAfter;
 
 	static std::unordered_map<int, std::string> initialMenuKeys;
@@ -361,10 +360,6 @@ namespace MainWindow {
 		}
 	}
 
-	static void setScreenRotation(int rotation) {
-		g_Config.iInternalScreenRotation = rotation;
-	}
-
 	static void SaveStateActionFinished(SaveState::Status status, const std::string &message, void *userdata) {
 		if (!message.empty() && (!g_Config.bDumpFrames || !g_Config.bDumpVideoOutput)) {
 			osm.Show(message, status == SaveState::Status::SUCCESS ? 2.0 : 5.0);
@@ -378,14 +373,6 @@ namespace MainWindow {
 		NativeMessageReceived("gpu_configChanged", "");
 	}
 
-	static void setTexFiltering(int type) {
-		g_Config.iTexFiltering = type;
-	}
-
-	static void setBufFilter(int type) {
-		g_Config.iBufFilter = type;
-	}
-
 	static void setTexScalingType(int type) {
 		g_Config.iTexScalingType = type;
 		NativeMessageReceived("gpu_configChanged", "");
@@ -517,10 +504,10 @@ namespace MainWindow {
 			UmdSwitchAction();
 			break;
 
-		case ID_EMULATION_ROTATION_H:                 setScreenRotation(ROTATION_LOCKED_HORIZONTAL); break;
-		case ID_EMULATION_ROTATION_V:                 setScreenRotation(ROTATION_LOCKED_VERTICAL); break;
-		case ID_EMULATION_ROTATION_H_R:               setScreenRotation(ROTATION_LOCKED_HORIZONTAL180); break;
-		case ID_EMULATION_ROTATION_V_R:               setScreenRotation(ROTATION_LOCKED_VERTICAL180); break;
+		case ID_EMULATION_ROTATION_H:   g_Config.iInternalScreenRotation = ROTATION_LOCKED_HORIZONTAL; break;
+		case ID_EMULATION_ROTATION_V:   g_Config.iInternalScreenRotation = ROTATION_LOCKED_VERTICAL; break;
+		case ID_EMULATION_ROTATION_H_R: g_Config.iInternalScreenRotation = ROTATION_LOCKED_HORIZONTAL180; break;
+		case ID_EMULATION_ROTATION_V_R: g_Config.iInternalScreenRotation = ROTATION_LOCKED_VERTICAL180; break;
 
 		case ID_EMULATION_CHEATS:
 			g_Config.bEnableCheats = !g_Config.bEnableCheats;
@@ -858,13 +845,13 @@ namespace MainWindow {
 		case ID_OPTIONS_VERTEXCACHE:
 			g_Config.bVertexCache = !g_Config.bVertexCache;
 			break;
-		case ID_OPTIONS_TEXTUREFILTERING_AUTO:   setTexFiltering(TEX_FILTER_AUTO); break;
-		case ID_OPTIONS_NEARESTFILTERING:        setTexFiltering(TEX_FILTER_FORCE_NEAREST); break;
-		case ID_OPTIONS_LINEARFILTERING:         setTexFiltering(TEX_FILTER_FORCE_LINEAR); break;
-		case ID_OPTIONS_AUTOMAXQUALITYFILTERING: setTexFiltering(TEX_FILTER_AUTO_MAX_QUALITY); break;
+		case ID_OPTIONS_TEXTUREFILTERING_AUTO:   g_Config.iTexFiltering = TEX_FILTER_AUTO; break;
+		case ID_OPTIONS_NEARESTFILTERING:        g_Config.iTexFiltering = TEX_FILTER_FORCE_NEAREST; break;
+		case ID_OPTIONS_LINEARFILTERING:         g_Config.iTexFiltering = TEX_FILTER_FORCE_LINEAR; break;
+		case ID_OPTIONS_AUTOMAXQUALITYFILTERING: g_Config.iTexFiltering = TEX_FILTER_AUTO_MAX_QUALITY; break;
 
-		case ID_OPTIONS_BUFLINEARFILTER:       setBufFilter(SCALE_LINEAR); break;
-		case ID_OPTIONS_BUFNEARESTFILTER:      setBufFilter(SCALE_NEAREST); break;
+		case ID_OPTIONS_BUFLINEARFILTER:  g_Config.iBufFilter = SCALE_LINEAR; break;
+		case ID_OPTIONS_BUFNEARESTFILTER: g_Config.iBufFilter = SCALE_NEAREST; break;
 
 		case ID_OPTIONS_TOPMOST:
 			g_Config.bTopMost = !g_Config.bTopMost;
diff --git a/ios/main.mm b/ios/main.mm
index 3caaf93e26..d1c56fc537 100644
--- a/ios/main.mm
+++ b/ios/main.mm
@@ -211,7 +211,7 @@ void System_SendMessage(const char *command, const char *parameter) {
 		}
 	} else if (!strcmp(command, "browse_folder")) {
 		DarwinDirectoryPanelCallback callback = [] (Path thePathChosen) {
-				NativeMessageReceived("browse_folder", thePathChosen.c_str());
+			NativeMessageReceived("browse_folderSelect", thePathChosen.c_str());
 		};
 
 		DarwinFileSystemServices services;