diff --git a/rvdc/src/lib.rs b/rvdc/src/lib.rs
index 33ed498..ef8bd4d 100644
--- a/rvdc/src/lib.rs
+++ b/rvdc/src/lib.rs
@@ -1702,9 +1702,12 @@ impl Inst {
 #[cfg(test)]
 mod tests {
     extern crate std;
+    use std::borrow::ToOwned;
+    use std::string::String;
+    use std::vec::Vec;
+
     use core::sync::atomic::AtomicU32;
     use core::sync::atomic::Ordering;
-    use std::prelude::rust_2024::*;
 
     use std::fmt::Write as _;
     use std::io::Write as _;
diff --git a/shell.nix b/shell.nix
index 9cbaea1..146226d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> { } }: pkgs.mkShell {
   packages = with pkgs; [
-    llvmPackages_18.clang-unwrapped
-    llvmPackages_18.lld
-    llvmPackages_18.bintools-unwrapped
+    llvmPackages_22.clang-unwrapped
+    llvmPackages_22.lld
+    llvmPackages_22.bintools-unwrapped
   ];
 }
diff --git a/src/emu.rs b/src/emu.rs
index 06a1eb9..05a18cf 100644
--- a/src/emu.rs
+++ b/src/emu.rs
@@ -569,11 +569,11 @@ impl<XLEN: XLen> Emulator<XLEN> {
                     |src| ((src as u32).signed_shr(imm.as_u32())) as u64,
                 );
             }
-            Inst::MulW { dest, src1, src2 } => todo!(),
-            Inst::DivW { dest, src1, src2 } => todo!(),
-            Inst::DivuW { dest, src1, src2 } => todo!(),
-            Inst::RemW { dest, src1, src2 } => todo!(),
-            Inst::RemuW { dest, src1, src2 } => todo!(),
+            Inst::MulW { .. } => todo!(),
+            Inst::DivW { .. } => todo!(),
+            Inst::DivuW { .. } => todo!(),
+            Inst::RemW { .. } => todo!(),
+            Inst::RemuW { .. } => todo!(),
             _ => todo!(),
         }