diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index 18c0494e..f37bdbd0 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -64,8 +64,6 @@ android {
     }
 }
 
-androidExtensions.isExperimental = true
-
 dependencies {
     val lifecycleVersion = "2.3.0-alpha03"
     val roomVersion = "2.2.5"
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
index 8a04f4c4..a90c11e4 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
@@ -224,7 +224,7 @@ data class SoftApConfigurationCompat(
     }
 
     @Suppress("DEPRECATION")
-    var bssid: MacAddressCompat?
+    inline var bssid: MacAddressCompat?
         get() = bssidAddr?.let { MacAddressCompat(it) }
         set(value) {
             bssidAddr = value?.addr