diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java
index 6c0a695000..33f2c76721 100644
--- a/android/src/mindustry/android/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -152,6 +152,7 @@ public class AndroidLauncher extends AndroidApplication{
 
         //new external folder
         Fi data = Core.files.absolute(getContext().getExternalFilesDir(null).getAbsolutePath());
+        Core.settings.setDataDirectory(data);
 
         //moved to internal storage if there's no file indicating that it moved
         if(!Core.files.local("files_moved").exists()){
@@ -170,8 +171,6 @@ public class AndroidLauncher extends AndroidApplication{
                 Log.err("Failed to move files!");
                 t.printStackTrace();
             }
-        }else{
-            Core.settings.setDataDirectory(data);
         }
     }
 
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index 70606c55d5..ab7587e9d5 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -439,7 +439,6 @@ public class UI implements ApplicationListener, Loadable{
         dialog.show();
     }
 
-
     public void showCustomConfirm(String title, String text, String yes, String no, Runnable confirmed, Runnable denied){
         FloatingDialog dialog = new FloatingDialog(title);
         dialog.cont.add(text).width(mobile ? 400f : 500f).wrap().pad(4f).get().setAlignment(Align.center, Align.center);
@@ -472,11 +471,11 @@ public class UI implements ApplicationListener, Loadable{
 
     public String formatAmount(int number){
         if(number >= 1000000){
-            return Strings.fixed(number / 1000000f, 1) + "[gray]" + Core.bundle.getOrNull("unit.millions") + "[]";
+            return Strings.fixed(number / 1000000f, 1) + "[gray]" + Core.bundle.get("unit.millions") + "[]";
         }else if(number >= 10000){
-            return number / 1000 + "[gray]k[]";
+            return number / 1000 + "[gray]" + Core.bundle.get("unit.thousands") + "[]";
         }else if(number >= 1000){
-            return Strings.fixed(number / 1000f, 1) + "[gray]" + Core.bundle.getOrNull("unit.thousands") + "[]";
+            return Strings.fixed(number / 1000f, 1) + "[gray]" + Core.bundle.get("unit.thousands") + "[]";
         }else{
             return number + "";
         }