diff --git a/.github/actions/bitcoin/action.yml b/.github/actions/bitcoin/action.yml
index 6f628172..2765571f 100644
--- a/.github/actions/bitcoin/action.yml
+++ b/.github/actions/bitcoin/action.yml
@@ -37,4 +37,4 @@ runs:
 
     - name: Bitcoin Regtest Daemon
       shell: bash
-      run: PATH=$PATH:/usr/bin ./orchestration/dev/networks/bitcoin/run.sh -daemon
+      run: PATH=$PATH:/usr/bin ./orchestration/dev/networks/bitcoin/run.sh -txindex -daemon
diff --git a/orchestration/dev/networks/bitcoin/run.sh b/orchestration/dev/networks/bitcoin/run.sh
index da7c95a8..bec89fa9 100755
--- a/orchestration/dev/networks/bitcoin/run.sh
+++ b/orchestration/dev/networks/bitcoin/run.sh
@@ -3,7 +3,7 @@
 RPC_USER="${RPC_USER:=serai}"
 RPC_PASS="${RPC_PASS:=seraidex}"
 
-bitcoind -txindex -regtest --port=8333 \
+bitcoind -regtest --port=8333 \
   -rpcuser=$RPC_USER -rpcpassword=$RPC_PASS \
   -rpcbind=0.0.0.0 -rpcallowip=0.0.0.0/0 -rpcport=8332 \
-  $1
+  $@
diff --git a/orchestration/dev/networks/ethereum-relayer/.folder b/orchestration/dev/networks/ethereum-relayer/.folder
index 675d4438..e69de29b 100644
--- a/orchestration/dev/networks/ethereum-relayer/.folder
+++ b/orchestration/dev/networks/ethereum-relayer/.folder
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-RPC_USER="${RPC_USER:=serai}"
-RPC_PASS="${RPC_PASS:=seraidex}"
-
-# Run Monero
-monerod --non-interactive --regtest --offline --fixed-difficulty=1 \
-  --no-zmq --rpc-bind-ip=0.0.0.0 --rpc-bind-port=18081 --confirm-external-bind \
-  --rpc-access-control-origins "*" --disable-rpc-ban \
-  --rpc-login=$RPC_USER:$RPC_PASS \
-  $1
diff --git a/orchestration/dev/networks/monero/run.sh b/orchestration/dev/networks/monero/run.sh
index 75a93e46..1186c4d1 100755
--- a/orchestration/dev/networks/monero/run.sh
+++ b/orchestration/dev/networks/monero/run.sh
@@ -8,4 +8,4 @@ monerod --non-interactive --regtest --offline --fixed-difficulty=1 \
   --no-zmq --rpc-bind-ip=0.0.0.0 --rpc-bind-port=18081 --confirm-external-bind \
   --rpc-access-control-origins "*" --disable-rpc-ban \
   --rpc-login=$RPC_USER:$RPC_PASS --log-level 2 \
-  $1
+  $@
diff --git a/orchestration/testnet/networks/bitcoin/run.sh b/orchestration/testnet/networks/bitcoin/run.sh
index dbec375a..6544243b 100755
--- a/orchestration/testnet/networks/bitcoin/run.sh
+++ b/orchestration/testnet/networks/bitcoin/run.sh
@@ -3,7 +3,7 @@
 RPC_USER="${RPC_USER:=serai}"
 RPC_PASS="${RPC_PASS:=seraidex}"
 
-bitcoind -txindex -testnet -port=8333 \
+bitcoind -testnet -port=8333 \
   -rpcuser=$RPC_USER -rpcpassword=$RPC_PASS \
   -rpcbind=0.0.0.0 -rpcallowip=0.0.0.0/0 -rpcport=8332 \
   --datadir=/volume
diff --git a/orchestration/testnet/networks/ethereum-relayer/.folder b/orchestration/testnet/networks/ethereum-relayer/.folder
index 675d4438..e69de29b 100644
--- a/orchestration/testnet/networks/ethereum-relayer/.folder
+++ b/orchestration/testnet/networks/ethereum-relayer/.folder
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-RPC_USER="${RPC_USER:=serai}"
-RPC_PASS="${RPC_PASS:=seraidex}"
-
-# Run Monero
-monerod --non-interactive --regtest --offline --fixed-difficulty=1 \
-  --no-zmq --rpc-bind-ip=0.0.0.0 --rpc-bind-port=18081 --confirm-external-bind \
-  --rpc-access-control-origins "*" --disable-rpc-ban \
-  --rpc-login=$RPC_USER:$RPC_PASS \
-  $1
diff --git a/processor/bitcoin/src/scheduler.rs b/processor/bitcoin/src/scheduler.rs
index 7f365c56..6e49d23d 100644
--- a/processor/bitcoin/src/scheduler.rs
+++ b/processor/bitcoin/src/scheduler.rs
@@ -64,12 +64,12 @@ fn signable_transaction<D: Db>(
     gets stuck, this lets anyone create a child transaction spending this output, raising the fee,
     getting the transaction unstuck (via CPFP).
   */
-  payments.push(Payment::new(
+  payments.push((
     // The generator is even so this is valid
-    Address::new(p2tr_script_buf(<Secp256k1 as Ciphersuite>::G::GENERATOR)),
+    Address::new(p2tr_script_buf(<Secp256k1 as Ciphersuite>::G::GENERATOR).unwrap()).unwrap(),
     // This uses the minimum output value allowed, as defined as a constant in bitcoin-serai
-    Balance { coin: Coin::Bitcoin, amount: Amount(bitcoin_serai::wallet::DUST) },
-    None,
+    // TODO: Add a test for this comparing to bitcoin's `minimal_non_dust`
+    bitcoin_serai::wallet::DUST,
   ));
 
   let change = change