diff --git a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt
index 3544bc8c..58e57599 100644
--- a/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt
@@ -85,7 +85,9 @@ class PublishingConventionPlugin : Plugin<Project> {
             )
 
             publishToMavenCentral()
-            signAllPublications()
+            if (project.hasProperty("signing.keyId") && project.property("signing.keyId").toString().isNotEmpty()) {
+                signAllPublications()
+            }
 
             pom {
                 name.set(project.name)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 56953cfe..4d0fcd11 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ materialIconsExtendedAndroid = "1.7.8"
 
 # Google Maps Platform
 mapsecrets = "2.0.1"
-mapsktx = "6.0.1"
+mapsktx = "6.1.0"
 
 # Testing
 androidCore = "1.7.0"
diff --git a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt b/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt
index 039aae58..98f722cf 100644
--- a/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt
+++ b/maps-app/src/main/java/com/google/maps/android/compose/markerexamples/MarkerClusteringActivity.kt
@@ -383,20 +383,8 @@ private enum class ClusteringType {
 }
 
 data class MyItem(
-    val itemPosition: LatLng,
-    val itemTitle: String,
-    val itemSnippet: String,
-    val itemZIndex: Float,
-) : ClusterItem {
-    override fun getPosition(): LatLng =
-        itemPosition
-
-    override fun getTitle(): String =
-        itemTitle
-
-    override fun getSnippet(): String =
-        itemSnippet
-
-    override fun getZIndex(): Float =
-        itemZIndex
-}
+    override val position: LatLng,
+    override val title: String,
+    override val snippet: String,
+    override val zIndex: Float,
+) : ClusterItem
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 41cc0b7e..e0b1768c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,6 +17,10 @@
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
+        if (providers.gradleProperty("useMavenLocal").orNull == "true" ||
+            providers.environmentVariable("USE_MAVEN_LOCAL").orNull == "true") {
+            mavenLocal()
+        }
         google()
         mavenCentral()
     }