diff --git a/app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt b/app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt
index b63f343..71aa386 100644
--- a/app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt
@@ -38,8 +38,8 @@ class OmapiApduInterface(
         check(!this::lastChannel.isInitialized) {
             "Can only open one channel"
         }
-        lastChannel = session.openLogicalChannel(aid)!!;
-        return 1;
+        lastChannel = session.openLogicalChannel(aid)!!
+        return 1
     }
 
     override fun logicalChannelClose(handle: Int) {
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
index 74f2147..7711643 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
@@ -109,7 +109,7 @@ open class MainActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
     override fun onOptionsItemSelected(item: MenuItem): Boolean =
         when (item.itemId) {
             R.id.settings -> {
-                startActivity(Intent(this, SettingsActivity::class.java));
+                startActivity(Intent(this, SettingsActivity::class.java))
                 true
             }
             R.id.reload -> {
diff --git a/app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt b/app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt
index ef877b4..6b09368 100644
--- a/app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt
+++ b/app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt
@@ -39,7 +39,7 @@ class TelephonyManagerApduInterface(
         val hex = aid.encodeHex()
         val channel = tm.iccOpenLogicalChannelByPortCompat(port.card.physicalSlotIndex, port.portIndex, hex, 0)
         if (channel.status != IccOpenLogicalChannelResponse.STATUS_NO_ERROR || channel.channel == IccOpenLogicalChannelResponse.INVALID_CHANNEL) {
-            throw IllegalArgumentException("Cannot open logical channel $hex via TelephonManager on slot ${port.card.physicalSlotIndex} port ${port.portIndex}");
+            throw IllegalArgumentException("Cannot open logical channel $hex via TelephonManager on slot ${port.card.physicalSlotIndex} port ${port.portIndex}")
         }
         lastChannel = channel.channel
         return lastChannel
diff --git a/app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyCompat.kt b/app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyCompat.kt
index 4c1e19f..dbd39f2 100644
--- a/app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyCompat.kt
+++ b/app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyCompat.kt
@@ -94,6 +94,7 @@ val TelephonyManager.uiccCardsInfoCompat: List<RealUiccCardInfoCompat>
 fun TelephonyManager.iccOpenLogicalChannelByPortCompat(
     slotIndex: Int, portIndex: Int, aid: String?, p2: Int
 ): IccOpenLogicalChannelResponse =
+    @Suppress("UNNECESSARY_NOT_NULL_ASSERTION")
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
         iccOpenLogicalChannelByPort(slotIndex, portIndex, aid, p2)!!
     } else {
diff --git a/libs/lpac-jni/build.gradle.kts b/libs/lpac-jni/build.gradle.kts
index ff34d56..93f6082 100644
--- a/libs/lpac-jni/build.gradle.kts
+++ b/libs/lpac-jni/build.gradle.kts
@@ -16,9 +16,9 @@ android {
         externalNativeBuild {
             ndkBuild {
                 cFlags(
-                    "-fmacro-prefix-map=${project.projectDir.toString()}=/fake/path/",
-                    "-fdebug-prefix-map=${project.projectDir.toString()}=/fake/path/",
-                    "-ffile-prefix-map=${project.projectDir.toString()}=/fake/path/"
+                    "-fmacro-prefix-map=${project.projectDir}=/fake/path/",
+                    "-fdebug-prefix-map=${project.projectDir}=/fake/path/",
+                    "-ffile-prefix-map=${project.projectDir}=/fake/path/"
                 )
             }
         }