diff --git a/.cargo/config b/.cargo/config
new file mode 100644
index 0000000..37971c6
--- /dev/null
+++ b/.cargo/config
@@ -0,0 +1,2 @@
+[target.riscv32imac-unknown-xous-elf]
+rustflags = ["--cfg",'curve25519_dalek_backend="u32e_backend"']
diff --git a/Cargo.toml b/Cargo.toml
index e2edff2..dcd2bbc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,3 +10,12 @@ resolver = "2"
 [profile.dev]
 
 opt-level = 2
+
+[patch.crates-io.getrandom]
+path = "../xous-core/imports/getrandom"
+
+# Until they release 0.5.2, we need to use master due to is-terminal
+[patch.crates-io.criterion]
+git = "https://github.com/bheisler/criterion.rs"
+rev = "b913e232edd98780961ecfbae836ec77ede49259"
+features = ["html_reports"]
diff --git a/curve25519-dalek/Cargo.toml b/curve25519-dalek/Cargo.toml
index e8cdce9..6813f5d 100644
--- a/curve25519-dalek/Cargo.toml
+++ b/curve25519-dalek/Cargo.toml
@@ -60,10 +60,11 @@ zeroize = { version = "1", default-features = false, optional = true }
 [target.'cfg(curve25519_dalek_backend = "u32e_backend")'.dependencies]
 log = { version = "0.4"}
 engine25519-as = {git = "https://github.com/betrusted-io/engine25519-as.git", rev = "d249c967556b02ab5439eacb5078fa00c60b93d6", default-features = false, features = []}
-engine-25519 = { git = "https://github.com/betrusted-io/xous-engine-25519.git", rev = "63d3d1f30736022e791deaacf4dd62c00b42fe2e"}
+# TODO: is there a better way to select this dep?
+#engine-25519 = { git = "https://github.com/betrusted-io/xous-engine-25519.git", rev = "63d3d1f30736022e791deaacf4dd62c00b42fe2e"}
+engine-25519 = {path = "../../xous-core/services/engine-25519"}
 utralib = {version = "0.1.24", default-features = false}
 
-
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 cpufeatures = "0.2.6"
 
@@ -77,6 +78,5 @@ legacy_compatibility = []
 group = ["dep:group", "rand_core"]
 group-bits = ["group", "ff/bits"]
 
-# TODO: clean this up as you can't select deps like this
 [target.'cfg(all(not(curve25519_dalek_backend = "fiat"), not(curve25519_dalek_backend = "serial"), target_arch = "x86_64"))'.dependencies]
 curve25519-dalek-derive = { version = "0.1", path = "../curve25519-dalek-derive" }