diff --git a/gradle/convention/gradle/wrapper/gradle-wrapper.properties b/gradle/convention/gradle/wrapper/gradle-wrapper.properties
index cbfa0b7be3da3ffb27298f9965f55a3057d8625d..aa520627104195ad680a007476109668c21ab7e8 100644
--- a/gradle/convention/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/convention/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
-distributionSha256Szm=23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionSha256Szm=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/convention/src/main/kotlin/justjanne.kotlin.android.gradle.kts b/gradle/convention/src/main/kotlin/justjanne.kotlin.android.gradle.kts
index ca3b3d88019815d3b9eeedef08c57f59937acabb..085a706c232d0e90b8453cbab7ccd2bebb2948c2 100644
--- a/gradle/convention/src/main/kotlin/justjanne.kotlin.android.gradle.kts
+++ b/gradle/convention/src/main/kotlin/justjanne.kotlin.android.gradle.kts
@@ -1,4 +1,3 @@
-import gradle.kotlin.dsl.accessors._5ee02a09f3b6dcc9700f8e51e448c252.implementation
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -9,7 +8,7 @@ plugins {
 }
 
 dependencies {
-  implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.10")
+  "implementation"("org.jetbrains.kotlin:kotlin-stdlib:1.6.10")
 }
 
 tasks.withType<KotlinCompile> {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cbfa0b7be3da3ffb27298f9965f55a3057d8625d..aa520627104195ad680a007476109668c21ab7e8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
-distributionSha256Szm=23b89f8eac363f5f4b8336e0530c7295c55b728a9caa5268fdd4a532610d5392
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionSha256Szm=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/QtType.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/QtType.kt
index 383eafcc54c28d43a8cafb86e6f7456a3e86d4b9..58a43cd3d09454a481b13d412b6b0f3e0ef66be4 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/QtType.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/QtType.kt
@@ -113,7 +113,7 @@ enum class QtType(val id: kotlin.Int, val serializer: Serializer<*>? = null) {
     get() = if (name.startsWith("Q")) {
       name
     } else {
-      name.toLowerCase(Locale.ENGLISH)
+      name.lowercase(Locale.ENGLISH)
     }
 
   companion object {
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/SignedId.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/SignedId.kt
index 63885e745de273ec6fed71076629e4498cf99458..656d2183757f2112b8a472a48b98d458c6b07d93 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/SignedId.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/SignedId.kt
@@ -27,7 +27,8 @@ typealias SignedId64 = Long
 
 typealias MsgId_Type = SignedId64
 
-inline class MsgId(val id: MsgId_Type) : Comparable<MsgId>, Serializable {
+@JvmInline
+value class MsgId(val id: MsgId_Type) : Comparable<MsgId>, Serializable {
   override fun compareTo(other: MsgId) = id.compareTo(other.id)
   inline fun isValidId() = id > 0
 
@@ -43,7 +44,8 @@ inline class MsgId(val id: MsgId_Type) : Comparable<MsgId>, Serializable {
 
 typealias NetworkId_Type = SignedId
 
-inline class NetworkId(val id: NetworkId_Type) : Comparable<NetworkId>, Serializable {
+@JvmInline
+value class NetworkId(val id: NetworkId_Type) : Comparable<NetworkId>, Serializable {
   override fun compareTo(other: NetworkId) = id.compareTo(other.id)
   inline fun isValidId() = id > 0
 
@@ -59,7 +61,8 @@ inline class NetworkId(val id: NetworkId_Type) : Comparable<NetworkId>, Serializ
 
 typealias BufferId_Type = SignedId
 
-inline class BufferId(val id: BufferId_Type) : Comparable<BufferId>, Serializable {
+@JvmInline
+value class BufferId(val id: BufferId_Type) : Comparable<BufferId>, Serializable {
   override fun compareTo(other: BufferId) = id.compareTo(other.id)
   inline fun isValidId() = id > 0
 
@@ -75,7 +78,8 @@ inline class BufferId(val id: BufferId_Type) : Comparable<BufferId>, Serializabl
 
 typealias IdentityId_Type = SignedId
 
-inline class IdentityId(val id: IdentityId_Type) : Comparable<IdentityId>, Serializable {
+@JvmInline
+value class IdentityId(val id: IdentityId_Type) : Comparable<IdentityId>, Serializable {
   override fun compareTo(other: IdentityId) = id.compareTo(other.id)
   inline fun isValidId() = id > 0
 
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/irc/IrcCaseMappers.kt b/lib/src/main/java/de/kuschku/libquassel/util/irc/IrcCaseMappers.kt
index bae4182c86eb3510d6fac8824619e03d4b5e7de2..4e6d6b77cddb33e853572e001fac26c5992ed2d9 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/irc/IrcCaseMappers.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/irc/IrcCaseMappers.kt
@@ -48,25 +48,25 @@ object IrcCaseMappers {
     }
 
     override fun toLowerCase(value: String): String {
-      return value.toLowerCase(Locale.ROOT)
+      return value.lowercase(Locale.ROOT)
     }
 
     override fun toUpperCase(value: String): String {
-      return value.toUpperCase(Locale.ROOT)
+      return value.uppercase(Locale.ROOT)
     }
   }
 
   internal class ClassicalIrcCaseMapper :
     IrcCaseMapper {
     override fun toLowerCase(value: String): String {
-      return value.toLowerCase(Locale.ROOT)
+      return value.lowercase(Locale.ROOT)
         .replace('[', '{')
         .replace(']', '}')
         .replace('^', '~')
     }
 
     override fun toUpperCase(value: String): String {
-      return value.toUpperCase(Locale.ROOT)
+      return value.uppercase(Locale.ROOT)
         .replace('{', '[')
         .replace('}', ']')
         .replace('~', '^')
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/irc/SenderColorUtil.kt b/lib/src/main/java/de/kuschku/libquassel/util/irc/SenderColorUtil.kt
index 503a788eaf4012c10a904dc88274b1c84e2b7508..89b2e9917ee565dcbc1eed6cb7f96f0c243dfe8e 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/irc/SenderColorUtil.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/irc/SenderColorUtil.kt
@@ -25,7 +25,7 @@ import java.util.*
 object SenderColorUtil {
   fun senderColor(nick: String): Int {
     return 0xf and CRCUtils.qChecksum(
-      nick.trimEnd('_').toLowerCase(Locale.ROOT).toByteArray(Charsets.ISO_8859_1)
+      nick.trimEnd('_').lowercase(Locale.ROOT).toByteArray(Charsets.ISO_8859_1)
     )
   }
 }
diff --git a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/AccountId.kt b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/AccountId.kt
index d6cc4d995924fc3f1b993184b29eee14d01995c2..243e03c47ebacc0b040b092bccac38e736dc5ba8 100644
--- a/persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/AccountId.kt
+++ b/persistence/src/main/java/de/kuschku/quasseldroid/persistence/util/AccountId.kt
@@ -23,7 +23,8 @@ import java.io.Serializable
 
 typealias AccountId_Type = Long
 
-inline class AccountId(val id: AccountId_Type) : Comparable<AccountId>, Serializable {
+@JvmInline
+value class AccountId(val id: AccountId_Type) : Comparable<AccountId>, Serializable {
   override fun compareTo(other: AccountId) = id.compareTo(other.id)
   inline fun isValidId() = id >= 0