diff --git a/zcash_client_backend/src/data_api/wallet/input_selection.rs b/zcash_client_backend/src/data_api/wallet/input_selection.rs
index f33efefc0..f03bd2b4f 100644
--- a/zcash_client_backend/src/data_api/wallet/input_selection.rs
+++ b/zcash_client_backend/src/data_api/wallet/input_selection.rs
@@ -26,7 +26,7 @@ use crate::{
     ShieldedProtocol,
 };
 
-#[cfg(any(feature = "transparent-inputs", feature = "orchard"))]
+#[cfg(any(feature = "transparent-inputs"))]
 use std::convert::Infallible;
 
 #[cfg(feature = "transparent-inputs")]
diff --git a/zcash_keys/src/address.rs b/zcash_keys/src/address.rs
index 662ad8768..ee91acb30 100644
--- a/zcash_keys/src/address.rs
+++ b/zcash_keys/src/address.rs
@@ -285,7 +285,8 @@ mod tests {
     fn ua_round_trip() {
         #[cfg(feature = "orchard")]
         let orchard = {
-            let sk = orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, 0).unwrap();
+            let sk =
+                orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, AccountId::ZERO).unwrap();
             let fvk = orchard::keys::FullViewingKey::from(&sk);
             Some(fvk.address_at(0u32, orchard::keys::Scope::External))
         };
diff --git a/zcash_keys/src/keys.rs b/zcash_keys/src/keys.rs
index 698006b08..2d867ab10 100644
--- a/zcash_keys/src/keys.rs
+++ b/zcash_keys/src/keys.rs
@@ -811,7 +811,8 @@ mod tests {
 
         #[cfg(feature = "orchard")]
         let orchard = {
-            let sk = orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, 0).unwrap();
+            let sk =
+                orchard::keys::SpendingKey::from_zip32_seed(&[0; 32], 0, AccountId::ZERO).unwrap();
             Some(orchard::keys::FullViewingKey::from(&sk))
         };