diff --git a/build.gradle b/build.gradle
index abad936f..224ea230 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.18.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
         classpath 'com.google.gms:google-services:4.0.1'
         classpath 'io.fabric.tools:gradle:1.25.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6210abc4..da435d83 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
index 3dff880d..8af0afb3 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
@@ -74,10 +74,10 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
         fun requestGroupUpdate() {
             group = null
             try {
-                p2pManager.requestPersistentGroupInfo(channel, {
+                p2pManager.requestPersistentGroupInfo(channel) {
                     groups = it
                     if (it.size == 1) group = it.single()
-                })
+                }
             } catch (e: ReflectiveOperationException) {
                 e.printStackTrace()
                 Crashlytics.logException(e)
@@ -186,7 +186,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
                 registerReceiver(receiver, intentFilter(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION,
                         WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION))
                 receiverRegistered = true
-                p2pManager.requestGroupInfo(channel, {
+                p2pManager.requestGroupInfo(channel) {
                     when {
                         it == null -> doStart()
                         it.isGroupOwner -> if (routingManager == null) doStart(it)
@@ -202,7 +202,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
                             })
                         }
                     }
-                })
+                }
             }
             else -> startFailure(getString(R.string.repeater_p2p_unavailable))
         }
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
index db3c7f70..76e47fdd 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
@@ -89,10 +89,12 @@ class RepeaterManager(private val parent: TetheringFragment) : Manager(), Servic
             val dialog = AlertDialog.Builder(parent.requireContext())
                     .setTitle(R.string.repeater_wps_dialog_title)
                     .setView(R.layout.dialog_wps)
-                    .setPositiveButton(android.R.string.ok, { dialog, _ -> binder?.startWps((dialog as AppCompatDialog)
-                            .findViewById<EditText>(android.R.id.edit)!!.text.toString()) })
+                    .setPositiveButton(android.R.string.ok) { dialog, _ ->
+                        binder?.startWps((dialog as AppCompatDialog)
+                            .findViewById<EditText>(android.R.id.edit)!!.text.toString())
+                    }
                     .setNegativeButton(android.R.string.cancel, null)
-                    .setNeutralButton(R.string.repeater_wps_dialog_pbc, { _, _ -> binder?.startWps(null) })
+                    .setNeutralButton(R.string.repeater_wps_dialog_pbc) { _, _ -> binder?.startWps(null) }
                     .create()
             dialog.window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE)
             dialog.show()
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pManagerHelper.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pManagerHelper.kt
index 62d96d60..a1fab70a 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pManagerHelper.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pManagerHelper.kt
@@ -105,16 +105,16 @@ object WifiP2pManagerHelper {
     fun WifiP2pManager.requestPersistentGroupInfo(c: WifiP2pManager.Channel,
                                                   listener: (Collection<WifiP2pGroup>) -> Unit) {
         val proxy = Proxy.newProxyInstance(interfacePersistentGroupInfoListener.classLoader,
-                arrayOf(interfacePersistentGroupInfoListener), { proxy, method, args ->
-            if (method.name == "onPersistentGroupInfoAvailable") {
-                if (args.size != 1) Crashlytics.log(Log.WARN, TAG, "Unexpected args: $args")
-                listener(getGroupList.invoke(args[0]) as Collection<WifiP2pGroup>)
-                null
-            } else {
-                Crashlytics.log(Log.WARN, TAG, "Unexpected method, calling super: $method")
-                ProxyBuilder.callSuper(proxy, method, args)
-            }
-        })
+                arrayOf(interfacePersistentGroupInfoListener)) { proxy, method, args ->
+                    if (method.name == "onPersistentGroupInfoAvailable") {
+                        if (args.size != 1) Crashlytics.log(Log.WARN, TAG, "Unexpected args: $args")
+                        listener(getGroupList.invoke(args[0]) as Collection<WifiP2pGroup>)
+                        null
+                    } else {
+                        Crashlytics.log(Log.WARN, TAG, "Unexpected method, calling super: $method")
+                        ProxyBuilder.callSuper(proxy, method, args)
+                    }
+                }
         requestPersistentGroupInfo.invoke(this, c, proxy)
     }
 
diff --git a/mobile/src/main/res/layout/dialog_wps.xml b/mobile/src/main/res/layout/dialog_wps.xml
index e3a7eaf8..c9fff917 100644
--- a/mobile/src/main/res/layout/dialog_wps.xml
+++ b/mobile/src/main/res/layout/dialog_wps.xml
@@ -11,6 +11,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
         android:inputType="number"
+        android:importantForAutofill="no"
         tools:text="12345678">
         <requestFocus/>
     </EditText>