diff --git a/project/java/Settings.java b/project/java/Settings.java
index f0881c1ec..b0301669c 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -299,6 +299,12 @@ class Settings
 			Globals.BrokenLibCMessageShown = settingsFile.readBoolean();
 			Globals.TouchscreenKeyboardDrawSize = settingsFile.readInt();
 			int cfgVersion = settingsFile.readInt();
+
+			settingsLoaded = true;
+
+			System.out.println("libSDL: Settings.Load(): loaded settings successfully");
+			settingsFile.close();
+
 			System.out.println("libSDL: old cfg version " + cfgVersion + ", our version " + p.getApplicationVersion());
 			if( cfgVersion != p.getApplicationVersion() )
 			{
@@ -307,15 +313,11 @@ class Settings
 				{
 					System.out.println("libSDL: old cfg version " + cfgVersion + ", our version " + p.getApplicationVersion() + " and we need to clean up config file");
 					// Delete settings file, and restart the application
-					settingsFile.close();
 					DeleteSdlConfigOnUpgradeAndRestart(p);
 				}
+				Save(p);
 			}
-			
-			settingsLoaded = true;
 
-			System.out.println("libSDL: Settings.Load(): loaded settings successfully");
-			settingsFile.close();
 			return;
 			
 		} catch( FileNotFoundException e ) {
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index 9c3f6dab2..d1b8a7ae0 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit 9c3f6dab2c39372aa6bcc6d6eccd8cf78d2f4be7
+Subproject commit d1b8a7ae03b1a0960722abbab38bbb8fca98e7cd
diff --git a/project/jni/application/gemrb/AndroidAppSettings.cfg b/project/jni/application/gemrb/AndroidAppSettings.cfg
index 3d2f633df..f36d324ce 100644
--- a/project/jni/application/gemrb/AndroidAppSettings.cfg
+++ b/project/jni/application/gemrb/AndroidAppSettings.cfg
@@ -14,6 +14,10 @@ SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=y
 CompatibilityHacks=n
+CompatibilityHacksStaticInit=n
+CompatibilityHacksTextInputEmulatesHwKeyboard=n
+CompatibilityHacksPreventAudioChopping=n
+CompatibilityHacksAppIgnoresAudioBufferSize=n
 AppUsesMouse=y
 AppNeedsTwoButtonMouse=y
 ShowMouseCursor=n
@@ -21,7 +25,7 @@ ForceRelativeMouseMode=n
 AppNeedsArrowKeys=n
 AppNeedsTextInput=y
 AppUsesJoystick=n
-AppHandlesJoystickSensitivity=n
+AppUsesAccelerometer=n
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
 RedefinedKeys="LCTRL c NO_REMAP NO_REMAP e"
@@ -32,9 +36,11 @@ StartupMenuButtonTimeout=2000
 HiddenMenuOptions=''
 FirstStartMenuOptions=''
 MultiABI=y
+AppMinimumRAM=0
 AppVersionCode=0701
 AppVersionName="0.7.0.1"
 ResetSdlConfigForThisVersion=y
+DeleteFilesOnUpgrade="%"
 CompiledLibraries="sdl_mixer sdl_ttf ogg vorbis openal png python"
 CustomBuildScript=n
 AppCflags='-fexceptions -finline-functions -O3 -DSTATIC_LINK=Yes -DHAVE_SNPRINTF'
@@ -42,3 +48,7 @@ AppLdflags=''
 AppSubdirsBuild='gemrb/gemrb/*'
 AppCmdline='GemRB'
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
+MinimumScreenSize=m
+AdmobPublisherId=n
+AdmobTestDeviceId=
+AdmobBannerSize=
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index a77103309..86f8d3231 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit a7710330935b977d3f068ca893f7fc2f89d48c1e
+Subproject commit 86f8d32314a322712afd0b23c6f33cda7d9ac726