diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index d4ef5612e..023025901 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit d4ef5612e979b11b07e4b35c0f683a2a8aefb19a
+Subproject commit 023025901a1d96a46d826791bf9cf264ddf5c9ee
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index ed71ad5bf..81f512da4 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit ed71ad5bf967c535f368b68b1044ca28ce5d28f4
+Subproject commit 81f512da4e50f0d65037e0e3516ea24dbced5a23
diff --git a/project/jni/application/opentyrian/AndroidAppSettings.cfg b/project/jni/application/opentyrian/AndroidAppSettings.cfg
index a7592ff67..ed0a6db44 100644
--- a/project/jni/application/opentyrian/AndroidAppSettings.cfg
+++ b/project/jni/application/opentyrian/AndroidAppSettings.cfg
@@ -34,9 +34,9 @@ StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=2120
-AppVersionName="2.1.20"
-ResetSdlConfigForThisVersion=y
+AppVersionCode=2121
+AppVersionName="2.1.21"
+ResetSdlConfigForThisVersion=n
 DeleteFilesOnUpgrade="%"
 CompiledLibraries="sdl_net"
 CustomBuildScript=n
diff --git a/project/jni/application/opentyrian/src/episodes.h b/project/jni/application/opentyrian/src/episodes.h
index baf4bc60a..2ebb749e3 100644
--- a/project/jni/application/opentyrian/src/episodes.h
+++ b/project/jni/application/opentyrian/src/episodes.h
@@ -146,18 +146,18 @@ typedef struct
 	JE_word     eenemydie;
 } JE_EnemyDatType[ENEMY_NUM + 1]; /* [0..enemynum] */
 
-extern JE_WeaponPortType weaponPort;
-extern JE_WeaponType weapons;
-extern JE_PowerType powerSys;
-extern JE_ShipType ships;
-extern JE_OptionType options[OPTION_NUM + 1]; /* [0..optionnum] */
-extern JE_ShieldType shields;
-extern JE_SpecialType special;
-extern JE_EnemyDatType enemyDat;
-extern JE_byte initial_episode_num, episodeNum;
-extern JE_boolean episodeAvail[EPISODE_MAX];
+extern "C" JE_WeaponPortType weaponPort;
+extern "C" JE_WeaponType weapons;
+extern "C" JE_PowerType powerSys;
+extern "C" JE_ShipType ships;
+extern "C" JE_OptionType options[OPTION_NUM + 1]; /* [0..optionnum] */
+extern "C" JE_ShieldType shields;
+extern "C" JE_SpecialType special;
+extern "C" JE_EnemyDatType enemyDat;
+extern "C" JE_byte initial_episode_num, episodeNum;
+extern "C" JE_boolean episodeAvail[EPISODE_MAX];
 
-extern char episode_file[13], cube_file[13];
+extern "C" char episode_file[13], cube_file[13];
 
 extern JE_longint episode1DataLoc;
 extern JE_boolean bonusLevel;