diff --git a/app/src/main/kotlin/org/meshtastic/app/auto/MeshtasticCarAppService.kt b/app/src/main/kotlin/org/meshtastic/app/auto/MeshtasticCarAppService.kt
index ad3042405..43f9c97ba 100644
--- a/app/src/main/kotlin/org/meshtastic/app/auto/MeshtasticCarAppService.kt
+++ b/app/src/main/kotlin/org/meshtastic/app/auto/MeshtasticCarAppService.kt
@@ -34,8 +34,4 @@ class MeshtasticCarAppService : CarAppService() {
 
     override fun onCreateSession(sessionInfo: SessionInfo): Session =
         MeshtasticCarSession()
-
-    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
-    override fun onCreateSession(): Session =
-        MeshtasticCarSession()
 }
diff --git a/core/service/src/androidMain/kotlin/org/meshtastic/core/service/ConversationShortcutManager.kt b/core/service/src/androidMain/kotlin/org/meshtastic/core/service/ConversationShortcutManager.kt
index 524f0b335..6f9588e11 100644
--- a/core/service/src/androidMain/kotlin/org/meshtastic/core/service/ConversationShortcutManager.kt
+++ b/core/service/src/androidMain/kotlin/org/meshtastic/core/service/ConversationShortcutManager.kt
@@ -75,7 +75,11 @@ class ConversationShortcutManager(
                 .distinctUntilChanged()
 
             val channelsFlow = radioConfigRepository.channelSetFlow
-                .map { cs -> cs.settings.filter { it.name.isNotEmpty() || cs.settings.indexOf(it) == 0 } }
+                .map { cs ->
+                    cs.settings.filterIndexed { index, settings ->
+                        settings.name.isNotEmpty() || index == 0
+                    }
+                }
                 .distinctUntilChanged()
 
             combine(favoritesFlow, channelsFlow) { favorites, channels ->