diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json
index 5ead5b251d..8e55c6f0ac 100644
--- a/android/assets/jsons/Translations/Notifications.json
+++ b/android/assets/jsons/Translations/Notifications.json
@@ -675,14 +675,14 @@
 		Ukrainian:"Розірвано альянс з містом-державою [name]"
 	}
 
-	"[civName] gave us a [untiName] as gift near [cityName]!":{ // When a city state gives a unit as gift.
-		Italian:"[civName] ci ha dato [untiName] come regalo vicino a [cityName]!"
-		French:"[civName] nous offre un(e) [untiName] prêt de [cityName]!"
-		Russian:"[civName] передал нам в дар [untiName] около города [cityName]!"
-		Simplified_Chinese:"[civName]将[cityName]附近的[untiName]赠予我们！",
-		Traditional_Chinese:"[civName]將[cityName]附近的[untiName]贈與我們！",
-		Czech:"Civilizace [civName] nám darovala jednotku [untiName] poblíž města [cityName]"
-		Ukrainian:"Цивілізація [civName] дарує підрозділ [untiName] біля міста [cityName]"
+	"[civName] gave us a [unitName] as gift near [cityName]!":{ // When a city state gives a unit as gift.
+		Italian:"[civName] ci ha dato [unitName] come regalo vicino a [cityName]!"
+		French:"[civName] nous offre un(e) [unitName] prêt de [cityName]!"
+		Russian:"[civName] передал нам в дар [unitName] около города [cityName]!"
+		Simplified_Chinese:"[civName]将[cityName]附近的[unitName]赠予我们！",
+		Traditional_Chinese:"[civName]將[cityName]附近的[unitName]贈與我們！",
+		Czech:"Civilizace [civName] nám darovala jednotku [unitName] poblíž města [cityName]"
+		Ukrainian:"Цивілізація [civName] дарує підрозділ [unitName] біля міста [cityName]"
 	}
 
 	"[civName] has denounced us!":{
diff --git a/build.gradle b/build.gradle
index 9386aeb4c7..26b84ea495 100644
--- a/build.gradle
+++ b/build.gradle
@@ -151,20 +151,20 @@ project(":core") {
              */
 
 
-            compile project(":core")
+            implementation project(":core")
 
-            compile "junit:junit:4.12"
-            compile "org.mockito:mockito-all:1.9.5"
+            implementation "junit:junit:4.12"
+            implementation "org.mockito:mockito-all:1.9.5"
 
-            compile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
-            compile "com.badlogicgames.gdx:gdx:$gdxVersion"
+            implementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
+            implementation "com.badlogicgames.gdx:gdx:$gdxVersion"
 
-            testCompile 'junit:junit:4.12'
-            testCompile "org.mockito:mockito-all:1.9.5"
+            testImplementation 'junit:junit:4.12'
+            testImplementation "org.mockito:mockito-all:1.9.5"
 
-            testCompile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
-            testCompile "com.badlogicgames.gdx:gdx:$gdxVersion"
-            testCompile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+            testImplementation "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
+            testImplementation "com.badlogicgames.gdx:gdx:$gdxVersion"
+            testImplementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
         }
     }}
 
diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
index ff68edb064..aa16506644 100644
--- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
+++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
@@ -356,7 +356,7 @@ class DiplomacyManager() {
         if (!otherCiv.isCityState()) {
             for (thirdCiv in otherCiv.getKnownCivs()) {
                 if (thirdCiv.isCityState() && thirdCiv.getAllyCiv() == otherCiv.civName
-                        && thirdCiv.knows(otherCiv)
+                        && thirdCiv.knows(civInfo)
                         && thirdCiv.getDiplomacyManager(civInfo).canDeclareWar()) {
                     thirdCiv.getDiplomacyManager(civInfo).declareWar()
                 }
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 89598df1b8..d4adf1ea0e 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -55,6 +55,6 @@ task afterEclipseImport(description: "Post processing after project generation",
 }
 
 dependencies {
-    compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
-    compile project(path: ':core')
+    implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+    implementation project(path: ':core')
 }
\ No newline at end of file