diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
index d9fff23aad..12f8ede4e4 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/OmnipodDashBleManagerImpl.kt
@@ -180,7 +180,6 @@ class OmnipodDashBleManagerImpl @Inject constructor(
             ?: throw FailedToConnectException("connection lost")
     }
 
-    @kotlin.ExperimentalStdlibApi
     override fun pairNewPod(): Observable<PodEvent> = Observable.create { emitter ->
         if (!busy.compareAndSet(false, true)) {
             throw BusyException()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt
index da5a5cbb96..0482a12660 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/comm/pair/LTKExchanger.kt
@@ -23,7 +23,6 @@ internal class LTKExchanger(
     private val keyExchange = KeyExchange(aapsLogger, X25519KeyGenerator(), RandomByteGenerator())
     private var seq: Byte = 1
 
-    @kotlin.ExperimentalStdlibApi
     @Throws(PairingException::class)
     fun negotiateLTK(): PairResult {
         val sp1sp2 = PairMessage(
@@ -114,7 +113,6 @@ internal class LTKExchanger(
         keyExchange.validatePodConf(payload)
     }
 
-    @kotlin.ExperimentalStdlibApi
     private fun sp2(): ByteArray {
         // This is GetPodStatus command, with page 0 parameter.
         // We could replace that in the future with the serialized GetPodStatus()
diff --git a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt
index 26b0a5c94e..7669f176f7 100644
--- a/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt
+++ b/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/definition/AlertConfiguration.kt
@@ -17,13 +17,13 @@ class AlertConfiguration(
         get() {
             var firstByte = (type.index.toInt() shl 4).toByte()
             if (enabled) {
-                firstByte = firstByte or (1 shl 3)
+                firstByte = (firstByte.toInt() or (1 shl 3)).toByte()
             }
             if (trigger is AlertTrigger.ReservoirVolumeTrigger) {
-                firstByte = firstByte or (1 shl 2)
+                firstByte = (firstByte.toInt() or (1 shl 2)).toByte()
             }
             if (autoOff) {
-                firstByte = firstByte or (1 shl 1)
+                firstByte = (firstByte.toInt() or (1 shl 1)).toByte()
             }
             firstByte = firstByte or ((durationInMinutes.toInt() shr 8 and 0x01).toByte())
             return ByteBuffer.allocate(6)