diff --git a/data/src/commonMain/kotlin/ca/gosyer/jui/data/base/WebsocketService.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/base/WebsocketService.kt
index fa78f350..bbedd72a 100644
--- a/data/src/commonMain/kotlin/ca/gosyer/jui/data/base/WebsocketService.kt
+++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/base/WebsocketService.kt
@@ -7,7 +7,6 @@
 package ca.gosyer.jui.data.base
 
 import ca.gosyer.jui.core.lang.throwIfCancellation
-import ca.gosyer.jui.data.build.BuildKonfig
 import ca.gosyer.jui.data.server.Http
 import ca.gosyer.jui.data.server.ServerPreferences
 import io.ktor.client.plugins.websocket.ws
@@ -33,7 +32,7 @@ abstract class WebsocketService(
     protected val client: Http
 ) {
     protected val json = Json {
-        ignoreUnknownKeys = !BuildKonfig.DEBUG
+        ignoreUnknownKeys = true
     }
     protected abstract val _status: MutableStateFlow<Status>
 
diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersMenu.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersMenu.kt
index 739315b7..eee55c8e 100644
--- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersMenu.kt
+++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/sources/browse/filter/SourceFiltersMenu.kt
@@ -57,6 +57,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEach
+import androidx.compose.ui.util.fastForEachIndexed
 import ca.gosyer.jui.data.models.sourcefilters.SortFilter
 import ca.gosyer.jui.i18n.MR
 import ca.gosyer.jui.ui.base.prefs.ExpandablePreference
@@ -269,7 +270,7 @@ fun SortView(sort: SourceFiltersView.Sort, startExpanded: Boolean, onExpandChang
         }
     ) {
         Column(Modifier.fillMaxWidth()) {
-            sort.filter.values.forEachIndexed { index, name ->
+            sort.filter.values.fastForEachIndexed { index, name ->
                 SortRow(
                     name = name,
                     selected = state?.index == index,