diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 20ffd60e..209b5bbb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -36,7 +36,7 @@ android {
         }
         create("release-debug") {
             initWith(getByName("release"))
-            applicationIdSuffix = ".release-debug"
+            applicationIdSuffix = ".release.debug"
             signingConfig = signingConfigs.getByName("debug")
         }
 
@@ -88,7 +88,7 @@ dependencies {
 
     // Default
     implementation("androidx.core:core-ktx:1.13.1")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.2")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.3")
     implementation("androidx.activity:activity-compose:1.9.0")
 
     // Compose BOM libraries
@@ -107,7 +107,7 @@ dependencies {
     implementation("androidx.compose.material:material")
 
     // All dependencies
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.3")
     implementation("com.google.accompanist:accompanist-swiperefresh:0.24.2-alpha")
 
     // Dagger - Hilt
@@ -167,6 +167,16 @@ dependencies {
     implementation("com.mikepenz:aboutlibraries-compose-m3:latest.release")
 
     // Translator
-    implementation("com.google.mlkit:translate:latest.release")
-    implementation("com.google.mlkit:language-id:latest.release")
+    implementation("com.google.mlkit:translate:latest.release") {
+        exclude("com.google.android.gms", "play-services-base")
+        exclude("com.google.android.datatransport", "transport-api")
+        exclude("com.google.android.datatransport", "transport-backend-cct")
+        exclude("com.google.android.datatransport", "transport-runtime")
+        exclude("com.google.firebase", "firebase-encoders-json")
+        exclude("com.google.firebase", "firebase-encoders")
+    }
+    implementation("com.google.mlkit:language-id:latest.release") {
+//        exclude("com.google.firebase", "firebase-encoders-json")
+//        exclude("com.google.firebase", "firebase-encoders")
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 653ee843..4057dcd0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -56,6 +56,12 @@
             </intent-filter>
         </activity>
 
+        <!-- Remove Firebase logging-->
+        <service
+            android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService"
+            tools:node="remove" />
+
+        <!-- Save app locales -->
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
             android:enabled="false"
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Theme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Theme.kt
index e7072e68..d98020d3 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Theme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Theme.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.os.Build
 import android.os.Parcelable
 import android.os.PowerManager
+import android.view.View
 import androidx.annotation.Keep
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.tween
@@ -97,6 +98,10 @@ fun BookStoryTheme(
             window.statusBarColor = Color.Transparent.toArgb()
             window.navigationBarColor = Color.Transparent.toArgb()
 
+            // Disabling Autofill
+            window.decorView.importantForAutofill =
+                View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS
+
             // Fix for nav bar being semi transparent in api 29+
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 window.isNavigationBarContrastEnforced = false