diff --git a/mobile/build.gradle b/mobile/build.gradle
index eb2c903f..18d827c2 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -11,8 +11,8 @@ if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Fdro
 android {
     compileSdkVersion 29
     compileOptions {
-        sourceCompatibility 1.8
-        targetCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     defaultConfig {
         applicationId "be.mygod.vpnhotspot"
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/IpNeighbourMonitoringService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/IpNeighbourMonitoringService.kt
index bd44d1a6..01fb5cad 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/IpNeighbourMonitoringService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/IpNeighbourMonitoringService.kt
@@ -21,8 +21,6 @@ abstract class IpNeighbourMonitoringService : Service(), IpNeighbourMonitor.Call
                     .distinctBy { it.lladdr }
                     .size
         }
-        ServiceNotification.startForeground(this,
-                activeIfaces.associate { Pair(it, sizeLookup[it] ?: 0) },
-                inactiveIfaces)
+        ServiceNotification.startForeground(this, activeIfaces.associateWith { sizeLookup[it] ?: 0 }, inactiveIfaces)
     }
 }