diff --git a/Cargo.toml b/Cargo.toml
index 69938ddadb..fa1711d850 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,21 +1,23 @@
 [package]
 name = "wasmtime-cli"
-authors = ["The Wasmtime Project Developers"]
 version = "0.2.0"
+authors = ["The Wasmtime Project Developers"]
 description = "Command-line interface for Wasmtime"
 license = "Apache-2.0 WITH LLVM-exception"
 documentation = "https://cranelift.readthedocs.io/"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/CraneStation/wasmtime"
+readme = "README.md"
 edition = "2018"
 default-run = "wasmtime"
 
 [dependencies]
-cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
+# Enable all supported architectures by default.
+cranelift-codegen = { version = "0.49", features = ["enable-serde", "all-arch"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
-cranelift-native = { version = "0.49" }
+cranelift-native = "0.49"
 wasmtime = { path = "crates/api" }
 wasmtime-debug = { path = "crates/debug" }
 wasmtime-environ = { path = "crates/environ" }
@@ -51,7 +53,12 @@ members = [
 exclude = ["crates/wasi-common/wasi-misc-tests"]
 
 [features]
-# Enable all supported architectures by default.
-default = ["cranelift-codegen/all-arch"]
-lightbeam = ["wasmtime-environ/lightbeam", "wasmtime-jit/lightbeam", "wasmtime-wast/lightbeam"]
+lightbeam = [
+    "wasmtime-environ/lightbeam",
+    "wasmtime-jit/lightbeam",
+    "wasmtime-wast/lightbeam"
+]
 wasi-c = ["wasmtime-wasi-c"]
+
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/clippy.toml b/clippy.toml
index d2012085bb..152f137769 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1 +1 @@
-doc-valid-idents = [ "WebAssembly" ]
+doc-valid-idents = ["WebAssembly"]
diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
index 3b2d787d82..f649eccbae 100644
--- a/crates/api/Cargo.toml
+++ b/crates/api/Cargo.toml
@@ -1,10 +1,11 @@
 [package]
 name = "wasmtime"
-authors = ["The Wasmtime Project Developers"]
 version = "0.1.0"
+authors = ["The Wasmtime Project Developers"]
 description = "High-level API to expose the Wasmtime runtime"
 license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/CraneStation/wasmtime"
+readme = "README.md"
 edition = "2018"
 
 [lib]
@@ -13,13 +14,13 @@ crate-type = ["lib", "staticlib", "cdylib"]
 
 [dependencies]
 cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
-cranelift-native = { version = "0.49" }
+cranelift-native = "0.49"
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
-cranelift-frontend = { version = "0.49" }
-wasmtime-runtime = { path="../runtime" }
-wasmtime-environ = { path="../environ" }
-wasmtime-jit = { path="../jit" }
+cranelift-frontend = "0.49"
+wasmtime-runtime = { path = "../runtime" }
+wasmtime-environ = { path = "../environ" }
+wasmtime-jit = { path = "../jit" }
 wasmparser = { version = "0.39.2", default-features = false }
 target-lexicon = { version = "0.9.0", default-features = false }
 anyhow = "1.0.19"
@@ -29,8 +30,19 @@ hashbrown = { version = "0.6.0", optional = true }
 
 [features]
 default = ["std"]
-std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std", "wasmparser/std"]
-core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core", "wasmparser/core"]
+std = [
+    "cranelift-codegen/std",
+    "cranelift-wasm/std",
+    "wasmtime-environ/std",
+    "wasmparser/std"
+]
+core = [
+    "hashbrown/nightly",
+    "cranelift-codegen/core",
+    "cranelift-wasm/core",
+    "wasmtime-environ/core",
+    "wasmparser/core"
+]
 
 [dev-dependencies]
 # for wasmtime.rs
@@ -38,7 +50,10 @@ wasi-common = { path = "../wasi-common" }
 docopt = "1.0.1"
 serde = { "version" = "1.0.94", features = ["derive"] }
 pretty_env_logger = "0.3.0"
-wasmtime-wast = { path="../wast" }
-wasmtime-wasi = { path="../wasi" }
+wasmtime-wast = { path = "../wast" }
+wasmtime-wasi = { path = "../wasi" }
 rayon = "1.1"
 file-per-thread-logger = "0.1.1"
+
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/crates/debug/Cargo.toml b/crates/debug/Cargo.toml
index f3f6258f83..e2aa49f612 100644
--- a/crates/debug/Cargo.toml
+++ b/crates/debug/Cargo.toml
@@ -3,11 +3,11 @@ name = "wasmtime-debug"
 version = "0.2.0"
 authors = ["The Wasmtime Project Developers"]
 description = "Debug utils for WebAsssembly code in Cranelift"
+license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/CraneStation/wasmtime"
 documentation = "https://docs.rs/wasmtime-debug/"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm", "debuginfo"]
-license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
 
@@ -30,5 +30,4 @@ std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std"]
 core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core"]
 
 [badges]
-maintenance = { status = "experimental" }
-travis-ci = { repository = "CraneStation/wasmtime" }
+maintenance = { status = "actively-developed" }
diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml
index 00da03f4a7..e73fcb873f 100644
--- a/crates/environ/Cargo.toml
+++ b/crates/environ/Cargo.toml
@@ -3,11 +3,11 @@ name = "wasmtime-environ"
 version = "0.2.0"
 authors = ["The Wasmtime Project Developers"]
 description = "Standalone environment support for WebAsssembly code in Cranelift"
+license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/CraneStation/wasmtime"
 documentation = "https://docs.rs/wasmtime-environ/"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
-license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
 
@@ -52,5 +52,4 @@ std = ["cranelift-codegen/std", "cranelift-wasm/std"]
 core = ["cranelift-codegen/core", "cranelift-wasm/core"]
 
 [badges]
-maintenance = { status = "experimental" }
-travis-ci = { repository = "CraneStation/wasmtime" }
+maintenance = { status = "actively-developed" }
diff --git a/crates/interface-types/Cargo.toml b/crates/interface-types/Cargo.toml
index 62a7ea7f3d..9b9f8e0a81 100644
--- a/crates/interface-types/Cargo.toml
+++ b/crates/interface-types/Cargo.toml
@@ -3,10 +3,10 @@ name = "wasmtime-interface-types"
 version = "0.2.0"
 authors = ["The Wasmtime Project Developers"]
 description = "Support for wasm interface types with wasmtime"
+license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/CraneStation/wasmtime"
-license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
 
@@ -18,3 +18,6 @@ wasmparser = { version = "0.39.2", default-features = false }
 wasm-webidl-bindings = "0.6"
 wasmtime-jit = { path = '../jit', default-features = false }
 wasmtime-runtime = { path = '../runtime', default-features = false }
+
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml
index fef86eb26b..0bd49d3242 100644
--- a/crates/jit/Cargo.toml
+++ b/crates/jit/Cargo.toml
@@ -3,10 +3,10 @@ name = "wasmtime-jit"
 version = "0.2.0"
 authors = ["The Wasmtime Project Developers"]
 description = "JIT-style execution for WebAsssembly code in Cranelift"
+license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/CraneStation/wasmtime"
-license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
 
@@ -14,7 +14,7 @@ edition = "2018"
 cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
-cranelift-frontend = { version = "0.49" }
+cranelift-frontend = "0.49"
 wasmtime-environ = { path = "../environ", default-features = false }
 wasmtime-runtime = { path = "../runtime", default-features = false }
 wasmtime-debug = { path = "../debug", default-features = false }
@@ -30,10 +30,23 @@ winapi = { version = "0.3.7", features = ["winnt", "impl-default"] }
 
 [features]
 default = ["std"]
-std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std", "wasmtime-debug/std", "wasmtime-runtime/std", "wasmparser/std"]
-core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core", "wasmtime-debug/core", "wasmparser/core"]
+std = [
+    "cranelift-codegen/std",
+    "cranelift-wasm/std",
+    "wasmtime-environ/std",
+    "wasmtime-debug/std",
+    "wasmtime-runtime/std",
+    "wasmparser/std"
+]
+core = [
+    "hashbrown/nightly",
+    "cranelift-codegen/core",
+    "cranelift-wasm/core",
+    "wasmtime-environ/core",
+    "wasmtime-debug/core",
+    "wasmparser/core"
+]
 lightbeam = ["wasmtime-environ/lightbeam"]
 
 [badges]
-maintenance = { status = "experimental" }
-travis-ci = { repository = "CraneStation/wasmtime" }
+maintenance = { status = "actively-developed" }
diff --git a/crates/lightbeam/Cargo.toml b/crates/lightbeam/Cargo.toml
index a4560ea8ad..14c2d6f7bd 100644
--- a/crates/lightbeam/Cargo.toml
+++ b/crates/lightbeam/Cargo.toml
@@ -2,12 +2,14 @@
 name = "lightbeam"
 version = "0.0.0"
 authors = ["The Lightbeam Project Developers"]
+description = "An optimising one-pass streaming compiler for WebAssembly"
 license = "Apache-2.0 WITH LLVM-exception"
+repository = "https://github.com/CraneStation/wasmtime"
 readme = "README.md"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm", "compile", "compiler", "jit"]
-publish = false
 edition = "2018"
+publish = false
 
 [dependencies]
 smallvec = "1.0.0"
@@ -18,7 +20,7 @@ memoffset = "0.5.1"
 itertools = "0.8"
 capstone = "0.6.0"
 thiserror = "1.0.4"
-cranelift-codegen = { version = "0.49" }
+cranelift-codegen = "0.49"
 multi_mut = "0.1"
 either = "1.5"
 typemap = "0.3"
diff --git a/crates/misc/py/Cargo.toml b/crates/misc/py/Cargo.toml
index 19f65e120d..167349dc8e 100644
--- a/crates/misc/py/Cargo.toml
+++ b/crates/misc/py/Cargo.toml
@@ -6,6 +6,8 @@ description = "Python extension for Wasmtime"
 license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm", "python"]
 keywords = ["webassembly", "wasm"]
+repository = "https://github.com/CraneStation/wasmtime"
+readme = "README.md"
 edition = "2018"
 
 [lib]
@@ -13,11 +15,11 @@ name = "_wasmtime"
 crate-type = ["cdylib"]
 
 [dependencies]
-cranelift-codegen = { version = "0.49" }
-cranelift-native = { version = "0.49" }
-cranelift-entity = { version = "0.49" }
-cranelift-wasm = { version = "0.49" }
-cranelift-frontend = { version = "0.49" }
+cranelift-codegen = "0.49"
+cranelift-native = "0.49"
+cranelift-entity = "0.49"
+cranelift-wasm = "0.49"
+cranelift-frontend = "0.49"
 wasmtime-environ = { path = "../../environ" }
 wasmtime-interface-types = { path = "../../interface-types" }
 wasmtime-jit = { path = "../../jit" }
@@ -26,7 +28,7 @@ target-lexicon = { version = "0.9.0", default-features = false }
 anyhow = "1.0.19"
 region = "2.0.0"
 wasmparser = "0.39.2"
+pyo3 = { version = "0.8.0", features = ["extension-module"] }
 
-[dependencies.pyo3]
-version = "0.8.0"
-features = ["extension-module"]
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/crates/misc/rust/Cargo.toml b/crates/misc/rust/Cargo.toml
index db7cd3e283..872c8e4e59 100644
--- a/crates/misc/rust/Cargo.toml
+++ b/crates/misc/rust/Cargo.toml
@@ -2,21 +2,26 @@
 name = "wasmtime-rust"
 version = "0.2.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-edition = "2018"
+description = "Rust extension for Wasmtime"
+license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm", "rust"]
 keywords = ["webassembly", "wasm"]
-license = "Apache-2.0 WITH LLVM-exception"
-description = "Rust extension for Wasmtime"
+repository = "https://github.com/CraneStation/wasmtime"
+readme = "README.md"
+edition = "2018"
 
 [lib]
 test = false
 doctest = false
 
 [dependencies]
-cranelift-codegen = { version = "0.49" }
-cranelift-native = { version = "0.49" }
+cranelift-codegen = "0.49"
+cranelift-native = "0.49"
 wasmtime-interface-types = { path = "../../interface-types" }
 wasmtime-jit = { path = "../../jit" }
 wasmtime-rust-macro = { path = "./macro" }
 wasmtime-wasi = { path = "../../wasi" }
 anyhow = "1.0.19"
+
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/crates/misc/rust/macro/Cargo.toml b/crates/misc/rust/macro/Cargo.toml
index 1244fc18ff..87994655e4 100644
--- a/crates/misc/rust/macro/Cargo.toml
+++ b/crates/misc/rust/macro/Cargo.toml
@@ -2,9 +2,11 @@
 name = "wasmtime-rust-macro"
 version = "0.2.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-edition = "2018"
-license = "Apache-2.0 WITH LLVM-exception"
 description = "Macro support crate for wasmtime-rust"
+license = "Apache-2.0 WITH LLVM-exception"
+repository = "https://github.com/CraneStation/wasmtime"
+readme = "README.md"
+edition = "2018"
 
 [lib]
 proc-macro = true
@@ -15,3 +17,6 @@ doctest = false
 proc-macro2 = "1.0"
 quote = "1.0"
 syn = { version = "1.0", features = ['full'] }
+
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/crates/obj/Cargo.toml b/crates/obj/Cargo.toml
index 7d498a74de..efc2c0f4b4 100644
--- a/crates/obj/Cargo.toml
+++ b/crates/obj/Cargo.toml
@@ -3,10 +3,10 @@ name = "wasmtime-obj"
 version = "0.2.0"
 authors = ["The Wasmtime Project Developers"]
 description = "Native object file output for WebAsssembly code in Wasmtime"
+license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/CraneStation/wasmtime"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
-license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
 
@@ -16,3 +16,6 @@ cranelift-entity = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
 wasmtime-environ = { path = "../environ" }
 faerie = "0.12.0"
+
+[badges]
+maintenance = { status = "experimental" }
diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
index 869ced4c62..8d57dff12b 100644
--- a/crates/runtime/Cargo.toml
+++ b/crates/runtime/Cargo.toml
@@ -3,10 +3,10 @@ name = "wasmtime-runtime"
 version = "0.2.0"
 authors = ["The Wasmtime Project Developers"]
 description = "Runtime library support for Wasmtime"
+license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/CraneStation/wasmtime"
-license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
 
@@ -18,7 +18,7 @@ wasmtime-environ = { path = "../environ", default-features = false }
 region = "2.0.0"
 lazy_static = "1.2.0"
 libc = { version = "0.2.60", default-features = false }
-memoffset = "0.5.1"
+memoffset = "0.5.3"
 indexmap = "1.0.2"
 hashbrown = { version = "0.6.0", optional = true }
 spin = { version = "0.5.2", optional = true }
@@ -33,8 +33,13 @@ cc = "1.0"
 [features]
 default = ["std"]
 std = ["cranelift-codegen/std", "cranelift-wasm/std", "wasmtime-environ/std"]
-core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "wasmtime-environ/core", "spin"]
+core = [
+    "hashbrown/nightly",
+    "cranelift-codegen/core",
+    "cranelift-wasm/core",
+    "wasmtime-environ/core",
+    "spin"
+]
 
 [badges]
-maintenance = { status = "experimental" }
-travis-ci = { repository = "CraneStation/wasmtime" }
+maintenance = { status = "actively-developed" }
diff --git a/crates/wasi-c/Cargo.toml b/crates/wasi-c/Cargo.toml
index 361f6013a1..aa54af4d73 100644
--- a/crates/wasi-c/Cargo.toml
+++ b/crates/wasi-c/Cargo.toml
@@ -3,10 +3,10 @@ name = "wasmtime-wasi-c"
 version = "0.2.0"
 authors = ["The Cranelift Project Developers"]
 description = "WASI API support for Wasmtime"
+license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/CraneStation/wasmtime"
-license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
 
@@ -26,5 +26,4 @@ cmake = "0.1.35"
 bindgen = "0.51.0"
 
 [badges]
-maintenance = { status = "experimental" }
-travis-ci = { repository = "CraneStation/wasmtime" }
+maintenance = { status = "actively-developed" }
diff --git a/crates/wasi-common/Cargo.toml b/crates/wasi-common/Cargo.toml
index 6031aa8eb0..26d4751b45 100644
--- a/crates/wasi-common/Cargo.toml
+++ b/crates/wasi-common/Cargo.toml
@@ -2,13 +2,13 @@
 name = "wasi-common"
 version = "0.5.0"
 authors = ["The Wasmtime Project Developers"]
-edition = "2018"
-license = "Apache-2.0 WITH LLVM-exception"
 description = "WASI implementation in Rust"
+license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/CraneStation/wasmtime"
 readme = "README.md"
+edition = "2018"
 
 [features]
 # this feature requires wasm32-wasi target installed, and it enables wasm32
@@ -16,7 +16,7 @@ readme = "README.md"
 wasm_tests = []
 
 [dependencies]
-wasi-common-cbindgen = { path = "wasi-common-cbindgen", version = "0.5.0" }
+wasi-common-cbindgen = { path = "wasi-common-cbindgen" }
 anyhow = "1.0"
 thiserror = "1.0"
 libc = "0.2"
@@ -26,13 +26,13 @@ log = "0.4"
 filetime = "0.2.7"
 lazy_static = "1.4.0"
 num = { version = "0.2.0", default-features = false }
-wig = { path = "wig", version = "0.1.0" }
+wig = { path = "wig" }
 
 [target.'cfg(unix)'.dependencies]
 nix = "0.15"
 
 [target.'cfg(windows)'.dependencies]
-winx = { path = "winx", version = "0.5.0" }
+winx = { path = "winx" }
 winapi = "0.3"
 cpu-time = "1.0"
 
@@ -42,7 +42,7 @@ wasmtime-environ = { path = "../environ" }
 wasmtime-jit = { path = "../jit" }
 wasmtime-wasi = { path = "../wasi" }
 wasmtime = { path = "../api" }
-cranelift-codegen = "0.49"
+cranelift-codegen = "0.49.0"
 target-lexicon = "0.9.0"
 pretty_env_logger = "0.3.0"
 tempfile = "3.1.0"
@@ -55,3 +55,5 @@ cfg-if = "0.1.9"
 name = "wasi_common"
 crate-type = ["rlib", "staticlib", "cdylib"]
 
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/crates/wasi-common/WASI b/crates/wasi-common/WASI
index 8651dfa37b..8a968f2667 160000
--- a/crates/wasi-common/WASI
+++ b/crates/wasi-common/WASI
@@ -1 +1 @@
-Subproject commit 8651dfa37b92d17215d1364f935ffa1ac2b77c60
+Subproject commit 8a968f26677e78c0bfbae7de8673702f71b7b39b
diff --git a/crates/wasi-common/wasi-common-cbindgen/Cargo.toml b/crates/wasi-common/wasi-common-cbindgen/Cargo.toml
index ae4d9ab28b..a088121203 100644
--- a/crates/wasi-common/wasi-common-cbindgen/Cargo.toml
+++ b/crates/wasi-common/wasi-common-cbindgen/Cargo.toml
@@ -2,9 +2,10 @@
 name = "wasi-common-cbindgen"
 version = "0.5.0"
 authors = ["Jakub Konka <kubkon@jakubkonka.com>"]
-edition = "2018"
-license = "Apache-2.0 WITH LLVM-exception"
 description = "Interface generator utilities used by wasi-common"
+license = "Apache-2.0 WITH LLVM-exception"
+repository = "https://github.com/CraneStation/wasmtime"
+edition = "2018"
 
 [lib]
 proc-macro = true
@@ -15,3 +16,6 @@ quote = "1.0.2"
 
 [dev-dependencies]
 trybuild = "1.0.4"
+
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/crates/wasi-common/wasi-misc-tests/Cargo.toml b/crates/wasi-common/wasi-misc-tests/Cargo.toml
index a8693af0ea..101a850cad 100644
--- a/crates/wasi-common/wasi-misc-tests/Cargo.toml
+++ b/crates/wasi-common/wasi-misc-tests/Cargo.toml
@@ -2,6 +2,7 @@
 name = "wasi-misc-tests"
 version = "0.1.0"
 authors = ["The Wasmtime Project Developers"]
+readme = "README.md"
 edition = "2018"
 publish = false
 
diff --git a/crates/wasi-common/wig/Cargo.toml b/crates/wasi-common/wig/Cargo.toml
index c51b0f6a44..9913a25280 100644
--- a/crates/wasi-common/wig/Cargo.toml
+++ b/crates/wasi-common/wig/Cargo.toml
@@ -2,11 +2,12 @@
 name = "wig"
 version = "0.1.0"
 authors = ["Dan Gohman <sunfish@mozilla.com>"]
-edition = "2018"
+description = "WebAssembly Interface Generator"
+license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
-license = "Apache-2.0 WITH LLVM-exception"
 repository = "https://github.com/CraneStation/wasmtime"
+edition = "2018"
 
 [lib]
 proc-macro = true
@@ -18,3 +19,6 @@ proc-macro2 = "1.0.6"
 # to use the witx parser it contains, rather than the witx crate from
 # crates.io, so that it always matches the version of the witx files.
 witx = { path = "../WASI/tools/witx" }
+
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/crates/wasi-common/winx/Cargo.toml b/crates/wasi-common/winx/Cargo.toml
index 82b03e111b..36bf64abfd 100644
--- a/crates/wasi-common/winx/Cargo.toml
+++ b/crates/wasi-common/winx/Cargo.toml
@@ -2,11 +2,29 @@
 name = "winx"
 version = "0.5.0"
 authors = ["Jakub Konka <kubkon@jakubkonka.com>"]
-edition = "2018"
-license = "Apache-2.0 WITH LLVM-exception"
 description = "Windows API helper library"
+license = "Apache-2.0 WITH LLVM-exception"
+repository = "https://github.com/CraneStation/wasmtime"
+edition = "2018"
 
 [dependencies]
-winapi = { version = "0.3", features = ["std", "errhandlingapi", "handleapi", "processthreadsapi", "securitybaseapi", "winbase", "winerror", "ws2def", "fileapi", "aclapi" ] }
 bitflags = "1.0"
 cvt = "0.1"
+
+[dependencies.winapi]
+version = "0.3"
+features = [
+    "std",
+    "errhandlingapi",
+    "handleapi",
+    "processthreadsapi",
+    "securitybaseapi",
+    "winbase",
+    "winerror",
+    "ws2def",
+    "fileapi",
+    "aclapi"
+]
+
+[badges]
+maintenance = { status = "actively-developed" }
diff --git a/crates/wasi/Cargo.toml b/crates/wasi/Cargo.toml
index 3bcb8a0f4a..0b4ff60a87 100644
--- a/crates/wasi/Cargo.toml
+++ b/crates/wasi/Cargo.toml
@@ -3,10 +3,10 @@ name = "wasmtime-wasi"
 version = "0.2.0"
 authors = ["The Cranelift Project Developers"]
 description = "WASI API support for Wasmtime"
+license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/CraneStation/wasmtime"
-license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
 
@@ -22,5 +22,4 @@ target-lexicon = "0.9.0"
 log = { version = "0.4.8", default-features = false }
 
 [badges]
-maintenance = { status = "experimental" }
-travis-ci = { repository = "CraneStation/wasmtime" }
+maintenance = { status = "actively-developed" }
diff --git a/crates/wast/Cargo.toml b/crates/wast/Cargo.toml
index ac7fd02ec1..356e9b36d8 100644
--- a/crates/wast/Cargo.toml
+++ b/crates/wast/Cargo.toml
@@ -3,10 +3,10 @@ name = "wasmtime-wast"
 version = "0.2.0"
 authors = ["The Wasmtime Project Developers"]
 description = "wast testing support for wasmtime"
+license = "Apache-2.0 WITH LLVM-exception"
 categories = ["wasm"]
 keywords = ["webassembly", "wasm"]
 repository = "https://github.com/CraneStation/wasmtime"
-license = "Apache-2.0 WITH LLVM-exception"
 readme = "README.md"
 edition = "2018"
 
@@ -22,8 +22,7 @@ anyhow = "1.0.19"
 target-lexicon = "0.9.0"
 
 [badges]
-maintenance = { status = "experimental" }
-travis-ci = { repository = "CraneStation/wasmtime" }
+maintenance = { status = "actively-developed" }
 
 [features]
 lightbeam = []
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index c78eb2b44f..5dcf67243c 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -13,14 +13,11 @@ wasmtime-environ = { path = "../wasmtime-environ" }
 wasmtime-jit = { path = "../wasmtime-jit" }
 cranelift-codegen = { version = "0.49", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.49", features = ["enable-serde"] }
-cranelift-native = { version = "0.49" }
+cranelift-native = "0.49"
 libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" }
-wasmparser = { version = "0.39.2", default-features = false }
+wasmparser = { version = "0.39.2", default-features = false, features = ["core"] }
 binaryen = "0.8.1"
 
-[features]
-default = ["wasmparser/core"]
-
 # Prevent this from interfering with workspaces
 [workspace]
 members = ["."]