diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
index 84778b8a1a56..5899b56c7017 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt
@@ -132,8 +132,8 @@ class TagLimitFragment : DialogFragment() {
     override fun onStart() {
         super.onStart()
         lifecycleScope.launch {
-            binding.loadingViews?.isVisible = true
-            binding.contentViews?.isVisible = false
+            binding.loadingViews.isVisible = true
+            binding.contentViews.isVisible = false
             val customStudyDefaults = withCol { sched.customStudyDefaults(deckId) }
             binding.requireOneOrMoreCheckBox.isChecked =
                 customStudyDefaults.tagsList.any { tag -> tag.include }
@@ -143,8 +143,8 @@ class TagLimitFragment : DialogFragment() {
                 }
             tagsIncludedAdapter.tags = tags.toMutableList() // make a copy
             tagsExcludedAdapter.tags = tags.toMutableList() // make a copy
-            binding.loadingViews?.isVisible = false
-            binding.contentViews?.isVisible = true
+            binding.loadingViews.isVisible = false
+            binding.contentViews.isVisible = true
         }
     }
 
diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AnalyticsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AnalyticsTest.kt
index 1f9064fc1004..e0adb9313c70 100644
--- a/AnkiDroid/src/test/java/com/ichi2/anki/AnalyticsTest.kt
+++ b/AnkiDroid/src/test/java/com/ichi2/anki/AnalyticsTest.kt
@@ -117,7 +117,7 @@ class AnalyticsTest {
 
                 // prepare analytics so we can inspect what happens
                 val spyHit = spy(ExceptionHit())
-                doReturn(spyHit).whenever(analytics)?.exception()
+                doReturn(spyHit).whenever(analytics).exception()
                 try {
                     UsageAnalytics.sendAnalyticsException(grandparentException, false)
                 } catch (e: Exception) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 97cacc0f8d56..3fc2c8d0450f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -89,7 +89,7 @@ androidTestJunit = "1.3.0"
 # https://github.com/junit-team/junit5/releases/
 junit = "6.0.2"
 # https://github.com/JetBrains/kotlin/releases/
-kotlin = '2.2.10'
+kotlin = '2.3.10'
 # https://github.com/Kotlin/kotlinx.serialization/releases
 kotlinxSerializationJson = "1.10.0"
 ktlintGradlePlugin = "14.0.1"