diff --git a/Cargo.lock b/Cargo.lock
index 42b5697..46827a2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1259,8 +1259,7 @@ dependencies = [
 [[package]]
 name = "hyperlight-component-macro"
 version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bc0fc7f0d77ab2c16277da4efb58fa99c56f607f9407fd5c0490909c327facd"
+source = "git+https://github.com/hyperlight-dev/hyperlight?rev=5f2eba98256ec59f07d7513757892f81b7e3b570#5f2eba98256ec59f07d7513757892f81b7e3b570"
 dependencies = [
  "env_logger",
  "hyperlight-component-util",
@@ -1269,14 +1268,13 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn",
- "wasmparser 0.224.1",
+ "wasmparser 0.235.0",
 ]
 
 [[package]]
 name = "hyperlight-component-util"
 version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88137b20c4761f4b309d36b22574e2283745afad5959df7ecc5928557417d098"
+source = "git+https://github.com/hyperlight-dev/hyperlight?rev=5f2eba98256ec59f07d7513757892f81b7e3b570#5f2eba98256ec59f07d7513757892f81b7e3b570"
 dependencies = [
  "itertools 0.14.0",
  "log",
@@ -1284,7 +1282,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn",
- "wasmparser 0.224.1",
+ "wasmparser 0.235.0",
 ]
 
 [[package]]
@@ -3148,9 +3146,9 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.224.1"
+version = "0.233.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f17a5917c2ddd3819e84c661fae0d6ba29d7b9c1f0e96c708c65a9c4188e11"
+checksum = "b51cb03afce7964bbfce46602d6cb358726f36430b6ba084ac6020d8ce5bc102"
 dependencies = [
  "bitflags 2.9.1",
  "hashbrown",
@@ -3161,9 +3159,9 @@ dependencies = [
 
 [[package]]
 name = "wasmparser"
-version = "0.233.0"
+version = "0.235.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b51cb03afce7964bbfce46602d6cb358726f36430b6ba084ac6020d8ce5bc102"
+checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917"
 dependencies = [
  "bitflags 2.9.1",
  "hashbrown",
diff --git a/src/hyperlight_wasm/Cargo.toml b/src/hyperlight_wasm/Cargo.toml
index 7223b52..013984f 100644
--- a/src/hyperlight_wasm/Cargo.toml
+++ b/src/hyperlight_wasm/Cargo.toml
@@ -54,7 +54,7 @@ windows = { version = "0.61", features = ["Win32_System_Threading"] }
 page_size = "0.6.0"
 
 [dev-dependencies]
-hyperlight-component-macro = "0.7.0"
+hyperlight-component-macro = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "5f2eba98256ec59f07d7513757892f81b7e3b570" }
 examples_common = { path = "../examples_common" }
 criterion = { version = "0.6.0", features = ["html_reports"] }
 crossbeam-queue = "0.3"
diff --git a/src/hyperlight_wasm_macro/Cargo.toml b/src/hyperlight_wasm_macro/Cargo.toml
index 275eab5..61d8e54 100644
--- a/src/hyperlight_wasm_macro/Cargo.toml
+++ b/src/hyperlight_wasm_macro/Cargo.toml
@@ -17,4 +17,4 @@ proc-macro2 = { version = "1.0.93" }
 syn = { version = "2.0.96" }
 itertools = { version = "0.14.0" }
 prettyplease = { version = "0.2.31" }
-hyperlight-component-util = { version = "0.7.0" }
+hyperlight-component-util = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "5f2eba98256ec59f07d7513757892f81b7e3b570" }
diff --git a/src/hyperlight_wasm_macro/src/wasmguest.rs b/src/hyperlight_wasm_macro/src/wasmguest.rs
index ed13682..02c2dce 100644
--- a/src/hyperlight_wasm_macro/src/wasmguest.rs
+++ b/src/hyperlight_wasm_macro/src/wasmguest.rs
@@ -68,7 +68,7 @@ fn emit_import_extern_decl<'b>(
                 })
                 .unzip::<_, _, Vec<_>, Vec<_>>();
             let ret = format_ident!("ret");
-            let is_ret_empty = matches!(&ft.result, etypes::Result::Named(rs) if rs.is_empty());
+            let is_ret_empty = ft.result.is_none();
             let ur = if is_ret_empty {
                 quote! { () }
             } else {
@@ -210,7 +210,7 @@ fn emit_wasm_function_call(
 
     // if the result is empty we don't want a return result with `get_typed_func`
     let rwt = match result {
-        etypes::Result::Named(rs) if rs.is_empty() => {
+        None => {
             quote! {
                 instance.get_typed_func::<(#(#pwts,)*), ()>(&mut *store, func_idx)?
                     .call(&mut *store, (#(#pus,)*))?;
diff --git a/src/wasm_runtime/Cargo.lock b/src/wasm_runtime/Cargo.lock
index e4be3ab..49a6514 100644
--- a/src/wasm_runtime/Cargo.lock
+++ b/src/wasm_runtime/Cargo.lock
@@ -613,8 +613,7 @@ dependencies = [
 [[package]]
 name = "hyperlight-component-util"
 version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88137b20c4761f4b309d36b22574e2283745afad5959df7ecc5928557417d098"
+source = "git+https://github.com/hyperlight-dev/hyperlight?rev=5f2eba98256ec59f07d7513757892f81b7e3b570#5f2eba98256ec59f07d7513757892f81b7e3b570"
 dependencies = [
  "itertools",
  "log",
@@ -622,7 +621,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn",
- "wasmparser 0.224.1",
+ "wasmparser 0.235.0",
 ]
 
 [[package]]
@@ -1801,6 +1800,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "wasmparser"
+version = "0.235.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917"
+dependencies = [
+ "bitflags",
+ "hashbrown",
+ "indexmap",
+ "semver",
+ "serde",
+]
+
 [[package]]
 name = "wasmprinter"
 version = "0.233.0"