diff --git a/Cargo.toml b/Cargo.toml
index d9721dd..6a9fb31 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,8 +27,8 @@ zcash_protocol = "0.4"
 zip32 = "0.1"
 orchard = "0.10"
 sapling = { package = "sapling-crypto", version = "0.3", features = ["temporary-zcashd"] }
-incrementalmerkletree = "0.8"
-bridgetree = "0.7"
+incrementalmerkletree = "0.7"
+bridgetree = "0.6"
 
 [dev-dependencies]
 bc-rand = "^0.4.0"
diff --git a/src/zcashd_wallet/wallet_tx.rs b/src/zcashd_wallet/wallet_tx.rs
index 8972901..354033e 100644
--- a/src/zcashd_wallet/wallet_tx.rs
+++ b/src/zcashd_wallet/wallet_tx.rs
@@ -144,13 +144,14 @@ impl Parse for WalletTx {
 
         let mut sapling_note_data = None;
         if transaction.version().has_sapling() {
-            sapling_note_data = parse!(p, "sapling_note_data")?;
+            let value = parse!(p, "sapling_note_data")?;
+            sapling_note_data = Some(value);
         }
 
         let mut orchard_tx_meta: Option<OrchardTxMeta> = None;
         if transaction.version().has_orchard() {
-            let meta = parse!(p, "orchard_tx_meta")?;
-            orchard_tx_meta = Some(meta);
+            let value = parse!(p, "orchard_tx_meta")?;
+            orchard_tx_meta = Some(value);
         }
 
         let unparsed_data = p.rest();