diff --git a/cli/src/main.rs b/cli/src/main.rs
index 30c8e2ca..cded744a 100644
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
@@ -131,7 +131,7 @@ fn main() {
             memory
         }
     };
-    #[cfg(all(feature = "jit", not(target_os = "windows"), target_arch = "x86_64"))]
+    #[cfg(all(not(target_os = "windows"), target_arch = "x86_64"))]
     if matches.value_of("use") == Some("jit") {
         executable.jit_compile().unwrap();
     }
diff --git a/src/program.rs b/src/program.rs
index fd74c98c..a16f32fe 100644
--- a/src/program.rs
+++ b/src/program.rs
@@ -296,7 +296,7 @@ macro_rules! declare_builtin_function {
         $arg_d:ident : u64,
         $arg_e:ident : u64,
         $memory_mapping:ident : &mut $MemoryMapping:ty,
-    ) -> Result<u64, Box<dyn std::error::Error>> $rust:tt) => {
+    ) -> Result<u64, $Error:ty> $rust:tt) => {
         $(#[$attr])*
         pub struct $name {}
         impl $name {
@@ -309,7 +309,7 @@ macro_rules! declare_builtin_function {
                 $arg_d: u64,
                 $arg_e: u64,
                 $memory_mapping: &mut $MemoryMapping,
-            ) -> Result<u64, Box<dyn std::error::Error>> {
+            ) -> Result<u64, $Error> {
                 $rust
             }
             /// VM interface