diff --git a/Cargo.toml b/Cargo.toml
index b1dfbc715e..19da9e5936 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,10 @@ members = [
     "applications/tari_miner",
 
 ]
-#
+
+# Add here until we move to edition=2021
+resolver = "2"
+
 
 # Shutdown when panicking so we can see the error, specifically for the wallet
 [profile.release]
diff --git a/base_layer/core/src/lib.rs b/base_layer/core/src/lib.rs
index da8a129755..472f87080b 100644
--- a/base_layer/core/src/lib.rs
+++ b/base_layer/core/src/lib.rs
@@ -78,6 +78,7 @@ mod domain_hashing {
         "com.tari.tari_project.base_layer.core.kernel_mmr",
         1
     );
+
     pub type KernelMmrHasherBlake256 = DomainSeparatedHasher<Blake256, KernelMmrHashDomain>;
     pub type KernelMmr = MerkleMountainRange<KernelMmrHasherBlake256, Vec<Hash>>;
     pub type PrunedKernelMmr = MerkleMountainRange<KernelMmrHasherBlake256, PrunedHashSet>;
diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml
index 1f0b7345ff..396184be00 100644
--- a/base_layer/wallet/Cargo.toml
+++ b/base_layer/wallet/Cargo.toml
@@ -7,6 +7,7 @@ version = "0.38.7"
 edition = "2018"
 
 [dependencies]
+tari_core = {path = "../../base_layer/core", version = "^0.38", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto"]}
 tari_common = { path = "../../common" }
 tari_common_types = { version = "^0.38", path = "../../base_layer/common_types" }
 tari_comms = { version = "^0.38", path = "../../comms/core" }
@@ -56,16 +57,12 @@ prost = "0.9"
 itertools = "0.10.3"
 chacha20poly1305 = "0.9.1"
 
-[dependencies.tari_core]
-path = "../../base_layer/core"
-version = "^0.38"
-default-features = false
-features = ["transactions", "mempool_proto", "base_node_proto", ]
 
 [dev-dependencies]
 tari_p2p = { version = "^0.38", path = "../p2p", features = ["test-mocks"] }
 tari_comms_dht = { version = "^0.38", path = "../../comms/dht", features = ["test-mocks"] }
 tari_test_utils = { version = "^0.38", path = "../../infrastructure/test_utils" }
+tari_core = {path = "../../base_layer/core", version = "^0.38", default-features = false, features = ["transactions", "mempool_proto", "base_node_proto", "base_node"]}
 env_logger = "0.7.1"
 prost = "0.9.0"
 
diff --git a/scripts/generate-coinsplits.ps1 b/scripts/generate-coinsplits.ps1
index b06cac4355..582b35f54d 100644
--- a/scripts/generate-coinsplits.ps1
+++ b/scripts/generate-coinsplits.ps1
@@ -3,9 +3,10 @@ $i=1
 Do {
     $i
 
-    $splits = get-random -max 10 -min 1
-    $tariAmount = get-random -max 50000 -min 10000
-    & cargo run --release --bin tari_console_wallet -- -b . --network esmeralda --password mike --command-mode-auto-exit  coin-split $tariAmount $splits
+    $splits = get-random -max 5 -min 1
+    $tariAmount = get-random -max 1000 -min 200
+    #& cargo run --release --bin tari_console_wallet -- -b .  --password mike --command-mode-auto-exit -p "wallet.base_node.base_node_rpc_pool_size=1" -p "wallet.command_send_wait_timeout=0" coin-split $tariAmount $splits 
+    & ../../target/release/tari_console_wallet -b .  --password mike --command-mode-auto-exit -p "wallet.base_node.base_node_rpc_pool_size=1" -p "wallet.command_send_wait_timeout=0" coin-split $tariAmount $splits 
 
 
     $i++