diff --git a/android/TerminalApp/Android.bp b/android/TerminalApp/Android.bp
index 5e45c02..84ba041 100644
--- a/android/TerminalApp/Android.bp
+++ b/android/TerminalApp/Android.bp
@@ -20,6 +20,7 @@
     platform_apis: true,
     privileged: true,
     optimize: {
+        optimize: true,
         proguard_flags_files: ["proguard.flags"],
         shrink_resources: true,
     },
diff --git a/android/virtmgr/src/crosvm.rs b/android/virtmgr/src/crosvm.rs
index 707f285..b2283d0 100644
--- a/android/virtmgr/src/crosvm.rs
+++ b/android/virtmgr/src/crosvm.rs
@@ -909,7 +909,7 @@
             shared_path.mask,
         );
 
-        let cfg_arg = format!("writeback=true,cache_policy=always,ugid_map='{}'", ugid_map_value);
+        let cfg_arg = format!("ugid_map='{}'", ugid_map_value);
 
         let mut command = Command::new(CROSVM_PATH);
         command
diff --git a/libs/apkverify/Android.bp b/libs/apkverify/Android.bp
index 4c5a622..90de043 100644
--- a/libs/apkverify/Android.bp
+++ b/libs/apkverify/Android.bp
@@ -27,7 +27,10 @@
     defaults: ["libapkverify.defaults"],
     // TODO(b/204562227): move to host_supported to the defaults to include tests
     host_supported: true,
-    apex_available: ["com.android.virt"],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_test {
diff --git a/libs/apkzip/Android.bp b/libs/apkzip/Android.bp
index dc35b5e..e121d17 100644
--- a/libs/apkzip/Android.bp
+++ b/libs/apkzip/Android.bp
@@ -21,7 +21,10 @@
     name: "libapkzip",
     defaults: ["libapkzip.defaults"],
     host_supported: true,
-    apex_available: ["com.android.virt"],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_test {