diff --git a/e2e_tests/tests/vsock.rs b/e2e_tests/tests/vsock.rs
index dfdb13c003..361c925c24 100644
--- a/e2e_tests/tests/vsock.rs
+++ b/e2e_tests/tests/vsock.rs
@@ -44,6 +44,7 @@ fn generate_vhost_port() -> u32 {
 }
 
 #[test]
+#[ignore = "Test failing in latest version of debian. b/346365355"]
 fn host_to_guest() {
     let guest_port = generate_vhost_port();
     let guest_cid = generate_guest_cid();
@@ -53,6 +54,7 @@ fn host_to_guest() {
 }
 
 #[test]
+#[ignore = "Test failing in latest version of debian. b/346365355"]
 fn host_to_guest_disable_sandbox() {
     let guest_port = generate_vhost_port();
     let guest_cid = generate_guest_cid();
@@ -64,6 +66,7 @@ fn host_to_guest_disable_sandbox() {
 }
 
 #[test]
+#[ignore = "Test failing in latest version of debian. b/346365355"]
 fn host_to_guest_snapshot_restore() {
     let guest_port = generate_vhost_port();
     let guest_cid = generate_guest_cid();
@@ -94,6 +97,7 @@ fn host_to_guest_snapshot_restore() {
 }
 
 #[test]
+#[ignore = "Test failing in latest version of debian. b/346365355"]
 fn host_to_guest_disable_sandbox_snapshot_restore() {
     let guest_port = generate_vhost_port();
     let guest_cid = generate_guest_cid();
diff --git a/media/libvda/README.md b/media/libvda/README.md
index 94206a2399..e02d96bf99 100644
--- a/media/libvda/README.md
+++ b/media/libvda/README.md
@@ -1,7 +1,7 @@
 # Libvda Rust wrapper
 
 Note: This crate is specific to ChromeOS and requires the native
-(libvda)\[https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform2/arc/vm/libvda\]
+[libvda](https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform2/arc/vm/libvda)
 library at link time.
 
 Rust wrapper for libvda. This library is used to enable communication with Chrome's GPU process to
diff --git a/tools/custom_checks b/tools/custom_checks
index 4f6a38b33b..d8bdd0f8ed 100755
--- a/tools/custom_checks
+++ b/tools/custom_checks
@@ -76,7 +76,7 @@ def check_line_endings(*files: str):
         check_endings(wdir_endings)
 
 
-def check_rust_lockfiles(*_files: str):
+def check_rust_lockfiles(*files: str):
     "Verifies that none of the Cargo.lock files require updates."
     lockfiles = [Path("Cargo.lock"), *Path("common").glob("*/Cargo.lock")]
     for path in lockfiles:
@@ -99,7 +99,7 @@ KNOWN_DISABLED_FEATURES = [
 ]
 
 
-def check_rust_features(*_files: str):
+def check_rust_features(*files: str):
     "Verifies that all cargo features are included in the list of features we compile upstream."
     metadata = json.loads(cmd("cargo metadata --format-version=1").stdout())
     crosvm_metadata = next(p for p in metadata["packages"] if p["name"] == "crosvm")
diff --git a/tools/impl/dev_container/version b/tools/impl/dev_container/version
index 0b2924127e..08263e330f 100644
--- a/tools/impl/dev_container/version
+++ b/tools/impl/dev_container/version
@@ -1 +1 @@
-r0043
+r0045
diff --git a/tools/impl/testvm/cloud_init.yaml b/tools/impl/testvm/cloud_init.yaml
index 67fa63d08f..1c36c227d6 100644
--- a/tools/impl/testvm/cloud_init.yaml
+++ b/tools/impl/testvm/cloud_init.yaml
@@ -23,6 +23,7 @@ preserve_hostname: true
 # Runtime dependencies of crosvm binaries.
 # Note: Keep in sync with ./install-[aarch64-]deps.sh
 packages:
+    - e2fsprogs
     - gcc
     - libavcodec60
     - libavutil58
@@ -61,7 +62,11 @@ runcmd:
     - echo "* soft core unlimited" > /etc/security/limits.conf
 
     # Trim some fat
-    - [apt-get, remove, --yes, vim-runtime, iso-codes, perl, grub-common]
+{% if v1.machine == 'aarch64' %}
+    - [apt-get, remove, --yes, --allow-remove-essential, vim-runtime, grub-common]
+{% else %}
+    - [apt-get, remove, --yes, --allow-remove-essential, vim-runtime, grub-common, grub-efi-amd64-signed]
+{% endif %}
     - [apt-get, autoremove, --yes]
     - [apt-get, clean, --yes]
     - [rm, -rf, /var/lib/apt/lists]
diff --git a/tools/impl/testvm/version b/tools/impl/testvm/version
index ebe99f0b1d..ccc8f88da0 100644
--- a/tools/impl/testvm/version
+++ b/tools/impl/testvm/version
@@ -1 +1 @@
-r0012
+r0013