diff --git a/Cargo.toml b/Cargo.toml
index 996ec7b8..cf75cb52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,10 +20,10 @@ smallvec = { version = "1.6", default-features = false, features = ["union"] }
 ahash = { version = "0.7", default-features = false }
 num-traits = { version = "0.2", default_features = false }
 smartstring = { version = "0.2.6", default_features = false }
-rhai_codegen = { version = "0.3.4", path = "codegen", features = ["metadata"] }
+rhai_codegen = { version = "0.3.4", path = "codegen", default_features = false }
 
 [features]
-default = ["smartstring/std"]   # remove 'smartstring/std' when smartstring is updated to support no-std
+default = ["smartstring/std", "ahash/std", "num-traits/std"] # remove 'smartstring/std' when smartstring is updated to support no-std
 unchecked = []                  # unchecked arithmetic
 sync = []                       # restrict to only types that implement Send + Sync
 no_optimize = []                # no script optimizer
@@ -39,9 +39,9 @@ no_closure = []                 # no automatic sharing and capture of anonymous
 no_module = []                  # no modules
 internals = []                  # expose internal data structures
 unicode-xid-ident = ["unicode-xid"] # allow Unicode Standard Annex #31 for identifiers.
-metadata = ["serde_json"]       # enable exporting functions metadata
+metadata = ["serde_json", "rhai_codegen/metadata"] # enable exporting functions metadata
 
-no_std = ["smallvec/union", "num-traits/libm", "core-error", "libm", "ahash/compile-time-rng"]
+no_std = ["num-traits/libm", "core-error", "libm", "ahash/compile-time-rng"]
 
 # compiling for WASM
 wasm-bindgen = ["instant/wasm-bindgen"]