diff --git a/Android.bp b/Android.bp
index 35d879e..286a78f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,7 +4,11 @@
 android_app {
     name: "PawletSetupWizard",
 
-    srcs: ["app/src/main/java/**/*.kt"],
+    srcs: [
+        "app/src/main/java/**/*.kt",
+        // Soong-only BuildConfig stand-in (Gradle generates its own).
+        "soong-stubs/**/*.kt",
+    ],
 
     resource_dirs: ["app/src/main/res"],
 
@@ -31,6 +35,7 @@ android_app {
         "androidx.activity_activity",
         "androidx.activity_activity-compose",
         "androidx.lifecycle_lifecycle-runtime-ktx",
+        "androidx.core_core-splashscreen",
 
         // Compose runtime + UI
         "androidx.compose.runtime_runtime",
@@ -53,10 +58,14 @@ android_app {
 
         // Telephony helpers
         "telephony-common",
-    ],
 
-    // OkHttp and Coil are not available as AOSP static_libs.
-    // Add them as android_library_import entries pointing to AARs in app/libs/
-    // once prebuilts are sourced from the Gradle dependency cache.
-    // See: https://git.oxmc.me/PawletOS/android_packages_apps_SetupWizard
+        // Device info library — source android_library from
+        // external/application_libs/AndroidDeviceInfo (the app/libs/ AAR is
+        // Gradle-only; defining an import here would collide with that module)
+        "android-device-info",
+
+        // Images — prebuilts/application_libs/coil (pulls okhttp3/okio/
+        // coroutines transitively via the import's static_libs)
+        "coil-compose",
+    ],
 }
diff --git a/app/src/main/java/dev/oxmc/setupwizard/entryPoint.kt b/app/src/main/java/dev/oxmc/setupwizard/entryPoint.kt
index 0b30a1d..6a4a597 100644
--- a/app/src/main/java/dev/oxmc/setupwizard/entryPoint.kt
+++ b/app/src/main/java/dev/oxmc/setupwizard/entryPoint.kt
@@ -76,7 +76,7 @@ class EntryPoint : BaseKioskActivity() {
         }
     }
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         uriHandler.handleIntent(intent)
     }
diff --git a/app/src/main/java/dev/oxmc/setupwizard/lib/WizardRegistry.kt b/app/src/main/java/dev/oxmc/setupwizard/lib/WizardRegistry.kt
index 32e61ed..db00ae0 100644
--- a/app/src/main/java/dev/oxmc/setupwizard/lib/WizardRegistry.kt
+++ b/app/src/main/java/dev/oxmc/setupwizard/lib/WizardRegistry.kt
@@ -21,14 +21,15 @@ fun buildBuiltinPages(
         id = "region",
         order = 10,
         content = { onNext, onBack ->
-            RegionSelectionScreen(onBack = onBack, onContinue = onNext)
+            // The screen persists the chosen region itself; the wizard only advances.
+            RegionSelectionScreen(onBack = onBack, onContinue = { onNext() })
         }
     ),
     WizardPage(
         id = "locale",
         order = 20,
         content = { onNext, onBack ->
-            LocaleSelectionScreen(onBack = onBack, onContinue = onNext)
+            LocaleSelectionScreen(onBack = onBack, onContinue = { onNext() })
         }
     ),
     WizardPage(
diff --git a/app/src/main/java/dev/oxmc/setupwizard/ui/screens/wizard/SetupCompleteScreen.kt b/app/src/main/java/dev/oxmc/setupwizard/ui/screens/wizard/SetupCompleteScreen.kt
index 9cca0e4..7aa128c 100644
--- a/app/src/main/java/dev/oxmc/setupwizard/ui/screens/wizard/SetupCompleteScreen.kt
+++ b/app/src/main/java/dev/oxmc/setupwizard/ui/screens/wizard/SetupCompleteScreen.kt
@@ -87,7 +87,7 @@ fun SetupCompleteScreen(
                         )
                     )
                 }
-                clipPath(path) { drawContent() }
+                clipPath(path) { this@drawWithContent.drawContent() }
             }
     ) {
         Surface(
diff --git a/soong-stubs/me/pawlet/setupwizard/BuildConfig.kt b/soong-stubs/me/pawlet/setupwizard/BuildConfig.kt
new file mode 100644
index 0000000..3fb81ec
--- /dev/null
+++ b/soong-stubs/me/pawlet/setupwizard/BuildConfig.kt
@@ -0,0 +1,15 @@
+// SPDX-FileCopyrightText: The PawletOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+// Soong-only stand-in for the Gradle-generated BuildConfig. This directory is
+// listed in Android.bp srcs but is NOT part of the Gradle source set, so the
+// two build systems never both define the class.
+package me.pawlet.setupwizard
+
+object BuildConfig {
+    const val DEBUG = false
+    const val APPLICATION_ID = "me.pawlet.setupwizard"
+    const val BUILD_TYPE = "release"
+    const val VERSION_CODE = 1
+    const val VERSION_NAME = "1.0.0"
+}