diff --git a/amethyst/build.gradle.kts b/amethyst/build.gradle.kts
index 1c6dc4e336..e4df9eb8bf 100644
--- a/amethyst/build.gradle.kts
+++ b/amethyst/build.gradle.kts
@@ -87,8 +87,10 @@ android {
         vectorDrawables {
             useSupportLibrary = true
         }
-        @Suppress("UnstableApiUsage")
-        resourceConfigurations +=
+    }
+
+    androidResources {
+        localeFilters +=
             listOf(
                 "ar",
                 "ar-rSA",
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
index 23c43ccd43..10ca2b3d48 100644
--- a/desktopApp/build.gradle.kts
+++ b/desktopApp/build.gradle.kts
@@ -98,7 +98,7 @@ dependencies {
     testImplementation(libs.okhttp)
 
     // Compose UI testing (createComposeRule / onNodeWithText / etc.)
-    testImplementation(compose.desktop.uiTestJUnit4)
+    testImplementation(libs.jetbrains.compose.ui.test.junit4)
 }
 
 compose.desktop {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 91935f2a2b..5fc22fe1fe 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -169,6 +169,7 @@ jetbrains-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime",
 jetbrains-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "jetbrainsCompose" }
 jetbrains-compose-ui-tooling = { module = "org.jetbrains.compose.ui:ui-tooling", version.ref = "jetbrainsCompose" }
 jetbrains-compose-ui-tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "jetbrainsCompose" }
+jetbrains-compose-ui-test-junit4 = { module = "org.jetbrains.compose.ui:ui-test-junit4", version.ref = "jetbrainsCompose" }
 google-mlkit-genai-proofreading = { group = "com.google.mlkit", name = "genai-proofreading", version.ref = "genaiProofreading" }
 google-mlkit-genai-prompt = { group = "com.google.mlkit", name = "genai-prompt", version.ref = "genaiPrompt" }
 google-mlkit-genai-rewriting = { group = "com.google.mlkit", name = "genai-rewriting", version.ref = "genaiRewriting" }
diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/graperank/GrapeRankPublisher.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/graperank/GrapeRankPublisher.kt
index 2735d7e08c..cd03bd7d04 100644
--- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/graperank/GrapeRankPublisher.kt
+++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/graperank/GrapeRankPublisher.kt
@@ -122,7 +122,7 @@ class GrapeRankPublisher(
             .filterIsInstance<ContactCardEvent>()
             .groupBy { it.aboutUser() }
             .mapNotNull { (target, cards) ->
-                val t = target ?: return@mapNotNull null
+                val t = target.ifBlank { return@mapNotNull null }
                 t to (cards.maxByOrNull { it.createdAt } ?: return@mapNotNull null)
             }.toMap()