diff --git a/CMakeLists.txt b/CMakeLists.txt
index bacb74ee63..95d9464074 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -276,9 +276,12 @@ if(ARM)
 		Common/ArmEmitter.cpp
 		Common/ArmThunk.cpp)
 elseif(X86)
+	# ARMEmitter is here for the unit tests and don't really hurt otherwise.
 	set(CommonExtra ${CommonExtra}
 		Common/ABI.cpp
 		Common/ABI.h
+		Common/ArmEmitter.h
+		Common/ArmEmitter.cpp
 		Common/CPUDetect.cpp
 		Common/CPUDetect.h
 		Common/Thunk.cpp
@@ -747,11 +750,11 @@ else()
 endif()
 
 set(NativeAppSource
+	android/jni/TestRunner.cpp
 	UI/NativeApp.cpp
 	UI/BackgroundAudio.cpp
 	UI/DevScreens.cpp
 	UI/EmuScreen.cpp
-	android/jni/TestRunner.cpp
 	UI/GameInfoCache.cpp
 	UI/MainScreen.cpp
 	UI/MiscScreens.cpp
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index 6384d70121..9f8da3c33f 100644
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@@ -15,16 +15,19 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
+
+#include "base/functional.h"
 #include "base/colorutil.h"
 #include "base/timeutil.h"
 #include "gfx_es2/draw_buffer.h"
-#include "file/vfs.h"
 #include "math/curves.h"
 #include "i18n/i18n.h"
 #include "ui/ui_context.h"
 #include "ui/view.h"
 #include "ui/viewgroup.h"
 #include "ui/ui.h"
+#include "file/vfs.h"
 #include "UI/MiscScreens.h"
 #include "UI/EmuScreen.h"
 #include "UI/MainScreen.h"
@@ -159,7 +162,7 @@ void UIScreenWithBackground::sendMessage(const char *message, const char *value)
 	I18NCategory *de = GetI18NCategory("Developer");
 	if (!strcmp(message, "language screen")) {
 		auto langScreen = new NewLanguageScreen(de->T("Language"));
-		langScreen->OnChoice.Handle(this, &UIScreenWithBackground::OnLanguageChange);
+		// langScreen->OnChoice.Handle(this, &UIScreenWithBackground::OnLanguageChange);
 		screenManager()->push(langScreen);
 	}
 }
diff --git a/UI/MiscScreens.h b/UI/MiscScreens.h
index 081c7dab0a..71896cf52c 100644
--- a/UI/MiscScreens.h
+++ b/UI/MiscScreens.h
@@ -21,8 +21,8 @@
 #include <map>
 #include <string>
 
-#include "base/functional.h"
 #include "file/file_util.h"
+#include "base/functional.h"
 #include "ui/ui_screen.h"
 #include "GPU/Common/PostShader.h"
 
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 08cb669149..2cd7076fd1 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -913,7 +913,7 @@ void NativeResized() {
 #if defined(__APPLE__) && !defined(USING_QT_UI)
 		static int dp_xres_old=dp_xres;
 		if (dp_xres != dp_xres_old) {
-			uiTexture->Load("ui_atlas.zim");
+			// uiTexture->Load("ui_atlas.zim");
 			dp_xres_old = dp_xres;
 		}
 #endif
diff --git a/lang b/lang
index fdc4558a98..0a1cd8714c 160000
--- a/lang
+++ b/lang
@@ -1 +1 @@
-Subproject commit fdc4558a98fe039dfa2028a2cd53edfdc0805054
+Subproject commit 0a1cd8714cbcdaa21673913b734aad26862624f5