diff --git a/android/build.gradle b/android/build.gradle
index 03397e45c3..fb12bde1c8 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 289
-        versionName "2.19.8"
+        versionCode 290
+        versionName "2.19.9"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt b/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt
index 668e15f0cf..79c4d5122b 100644
--- a/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt
+++ b/core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt
@@ -41,16 +41,16 @@ class CityScreenCityPickerTable(val cityScreen: CityScreen) : Table(){
         val currentCityLabel = Label(city.name + " (" + city.population.population + ")", CameraStageBaseScreen.skin)
         currentCityLabel.setFontSize(25)
         currentCityLabel.onClick {
-            val popup = PopupTable(cityScreen)
+            val editCityNamePopup = PopupTable(cityScreen)
             val textArea = TextField(city.name, CameraStageBaseScreen.skin)
             textArea.setAlignment(Align.center)
-            popup.add(textArea).colspan(2).row()
-            popup.addButton("Close".tr()){popup.remove()}
-            popup.addButton("Save".tr()){
+            editCityNamePopup.add(textArea).colspan(2).row()
+            editCityNamePopup.addButton("Close".tr()){editCityNamePopup.close()}
+            editCityNamePopup.addButton("Save".tr()){
                 city.name = textArea.text
                 cityScreen.game.screen = CityScreen(city)
             }
-            popup.open()
+            editCityNamePopup.open()
         }
 
         cityNameTable.add(currentCityLabel)
diff --git a/core/src/com/unciv/ui/saves/LoadGameScreen.kt b/core/src/com/unciv/ui/saves/LoadGameScreen.kt
index eda487e50d..06a4918846 100644
--- a/core/src/com/unciv/ui/saves/LoadGameScreen.kt
+++ b/core/src/com/unciv/ui/saves/LoadGameScreen.kt
@@ -40,12 +40,12 @@ class LoadGameScreen : PickerScreen() {
                 UnCivGame.Current.loadGame(selectedSave)
             }
             catch (ex:Exception){
-                val popup = PopupTable(this)
-                popup.addGoodSizedLabel("It looks like your saved game can't be loaded!").row()
-                popup.addGoodSizedLabel("If you could copy your game data (\"Copy saved game to clipboard\" - ").row()
-                popup.addGoodSizedLabel("  paste into an email to yairm210@hotmail.com)").row()
-                popup.addGoodSizedLabel("I could maybe help you figure out what went wrong, since this isn't supposed to happen!").row()
-                popup.open()
+                val cantLoadGamePopup = PopupTable(this)
+                cantLoadGamePopup.addGoodSizedLabel("It looks like your saved game can't be loaded!").row()
+                cantLoadGamePopup.addGoodSizedLabel("If you could copy your game data (\"Copy saved game to clipboard\" - ").row()
+                cantLoadGamePopup.addGoodSizedLabel("  paste into an email to yairm210@hotmail.com)").row()
+                cantLoadGamePopup.addGoodSizedLabel("I could maybe help you figure out what went wrong, since this isn't supposed to happen!").row()
+                cantLoadGamePopup.open()
                 ex.printStackTrace()
             }
         }
diff --git a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
index 9f10169ec8..071cc0ad47 100644
--- a/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
@@ -171,14 +171,14 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
                     worldScreen.shouldUpdate = true
                 }
                 catch (ex:Exception){
-                    val popup = PopupTable(worldScreen)
-                    popup.addGoodSizedLabel("You've encountered a bug that I've been looking for for a while!").row()
-                    popup.addGoodSizedLabel("If you could copy your game data (\"Copy saved game to clipboard\" - ").row()
-                    popup.addGoodSizedLabel("  paste into an email to yairm210@hotmail.com)").row()
-                    popup.addGoodSizedLabel("It would help me figure out what went wrong, since this isn't supposed to happen!").row()
-                    popup.addGoodSizedLabel("If you could tell me which unit was selected and which unit you tried to attack,").row()
-                    popup.addGoodSizedLabel("  that would be even better!").row()
-                    popup.open()
+                    val battleBugPopup = PopupTable(worldScreen)
+                    battleBugPopup.addGoodSizedLabel("You've encountered a bug that I've been looking for for a while!").row()
+                    battleBugPopup.addGoodSizedLabel("If you could copy your game data (\"Copy saved game to clipboard\" - ").row()
+                    battleBugPopup.addGoodSizedLabel("  paste into an email to yairm210@hotmail.com)").row()
+                    battleBugPopup.addGoodSizedLabel("It would help me figure out what went wrong, since this isn't supposed to happen!").row()
+                    battleBugPopup.addGoodSizedLabel("If you could tell me which unit was selected and which unit you tried to attack,").row()
+                    battleBugPopup.addGoodSizedLabel("  that would be even better!").row()
+                    battleBugPopup.open()
                 }
             }
         }