diff --git a/Cargo.toml b/Cargo.toml
index 7add72a..4ab6be4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,13 +22,13 @@ embedded-svc = { git = "https://github.com/esp-rs/embedded-svc" }
 esp-idf-svc = { git = "https://github.com/esp-rs/esp-idf-svc", branch = "gatt" }
 #esp-idf-svc = { path = "../esp-idf-svc" }
 rs-matter = { git = "https://github.com/ivmarkov/rs-matter", branch = "wifi" }
-rs-matter-macros = { git = "https://github.com/ivmarkov/rs-matter", branch = "wifi" }
 #rs-matter = { path = "../rs-matter/rs-matter" }
+rs-matter-macros = { git = "https://github.com/ivmarkov/rs-matter", branch = "wifi" }
 #rs-matter-macros = { path = "../rs-matter/rs-matter-macros" }
 edge-nal = { git = "https://github.com/ivmarkov/edge-net" }
 #edge-nal = { path = "../edge-net/edge-nal" }
 edge-nal-std = { git = "https://github.com/ivmarkov/edge-net" }
-#edge-nal-std = { path = "../edge-net/edge-nal" }
+#edge-nal-std = { path = "../edge-net/edge-nal-std" }
 
 [profile.release]
 opt-level = "s"
@@ -41,8 +41,8 @@ opt-level = "z"
 #default = ["rs-matter-stack"]
 default = ["rs-matter-stack", "async-io-mini"]
 rs-matter-stack = ["dep:rs-matter-stack", "std"]
-async-io-mini = ["std", "dep:async-io-mini", "edge-nal-std/async-io-mini"]
-std = ["esp-idf-svc/std"]
+async-io-mini = ["std", "edge-nal-std/async-io-mini"]
+std = ["esp-idf-svc/std", "edge-nal-std"]
 examples = ["default", "esp-idf-svc/binstart", "esp-idf-svc/critical-section"] # Enable only when building the examples
 
 [dependencies]
@@ -57,12 +57,11 @@ esp-idf-svc = { version = "0.48", default-features = false, features = ["alloc",
 embedded-svc = { version = "0.27", default-features = false }
 rs-matter = { version = "0.1", default-features = false, features = ["rustcrypto"] }
 rs-matter-macros = "0.1"
-async-io = { version = "=2.0.0", optional = true, default-features = false } # Workaround for https://github.com/smol-rs/async-lock/issues/84
-async-io-mini = { git = "https://github.com/ivmarkov/async-io-mini", optional = true }
-rs-matter-stack = { git = "https://github.com/ivmarkov/rs-matter-stack", default-features = true, features = ["std"], optional = true }
-#rs-matter-stack = { path = "../rs-matter-stack", default-features = true, features = ["std"], optional = true }
+async-io = { version = "=2.0.0", default-features = false } # Workaround for https://github.com/smol-rs/async-lock/issues/84
+rs-matter-stack = { git = "https://github.com/ivmarkov/rs-matter-stack", default-features = false, features = ["std"], optional = true }
+#rs-matter-stack = { path = "../rs-matter-stack", default-features = false, features = ["std"], optional = true }
 edge-nal = "0.2"
-edge-nal-std = "0.2"
+edge-nal-std = { version = "0.2", default-features = false, optional = true }
 
 [build-dependencies]
 embuild = "0.31.3"