diff --git a/androidApp/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt b/androidApp/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt
index 38d945ce0..781485674 100644
--- a/androidApp/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt
+++ b/androidApp/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt
@@ -73,7 +73,7 @@ internal class MainViewModel(
     fun analyticsTrackDestination(destination: NavDestination, arguments: Bundle?) {
         val hashMap = hashMapOf<String, String>()
         arguments?.keySet()?.forEach { key ->
-            hashMap[key] = arguments.get(key).toString()
+            hashMap[key] = arguments.getString(key).orEmpty()
         }
         analytics.trackDestination(destination.route, hashMap)
     }
diff --git a/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
index f5fe9b901..3d5ee2513 100644
--- a/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
+++ b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/app/AppServiceImpl.kt
@@ -1,5 +1,6 @@
 package org.michaelbel.movies.platform.impl.app
 
+import org.michaelbel.movies.platform.Flavor
 import org.michaelbel.movies.platform.app.AppService
 
 class AppServiceImpl: AppService {
diff --git a/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
index 89542dfd5..a66b96504 100644
--- a/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
+++ b/core/platform-services/hms/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/update/UpdateServiceImpl.kt
@@ -1,6 +1,7 @@
 package org.michaelbel.movies.platform.impl.update
 
 import android.app.Activity
+import org.michaelbel.movies.platform.update.UpdateListener
 import org.michaelbel.movies.platform.update.UpdateService
 
 class UpdateServiceImpl: UpdateService {
diff --git a/core/platform-services/inject-desktop/build.gradle.kts b/core/platform-services/inject-desktop/build.gradle.kts
index 1ac65df7c..33ce3bd87 100644
--- a/core/platform-services/inject-desktop/build.gradle.kts
+++ b/core/platform-services/inject-desktop/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
-    alias(libs.plugins.android.library)
 }
 
 kotlin {
@@ -13,21 +12,4 @@ kotlin {
             implementation(libs.bundles.koin.common)
         }
     }
-}
-
-android {
-    namespace = "org.michaelbel.movies.platform.inject_desktop"
-
-    defaultConfig {
-        minSdk = libs.versions.min.sdk.get().toInt()
-        compileSdk = libs.versions.compile.sdk.get().toInt()
-    }
-
-    lint {
-        quiet = true
-        abortOnError = false
-        ignoreWarnings = true
-        checkDependencies = true
-        lintConfig = file("${project.rootDir}/config/codestyle/lint.xml")
-    }
 }
\ No newline at end of file