diff --git a/.codespellrc b/.codespellrc
index 2d242dca9ff..d14b397da25 100644
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,3 +1,4 @@
 [codespell]
-ignore-words-list=crate,Sur,inout,Groth,groth,re-use,
-exclude-file=book/mermaid.min.js
+ignore-words-list = crate,Sur,inout,Groth,groth,re-use,
+exclude-file = book/mermaid.min.js
+skip = ./zebra-rpc/qa/rpc-tests,./supply-chain
diff --git a/zebra-chain/src/transaction/serialize.rs b/zebra-chain/src/transaction/serialize.rs
index ba65dd054b3..0e583efc5bf 100644
--- a/zebra-chain/src/transaction/serialize.rs
+++ b/zebra-chain/src/transaction/serialize.rs
@@ -622,9 +622,8 @@ impl ZcashSerialize for Transaction {
                 }
 
                 // Denoted as `bindingSigSapling` in the spec.
-                match sapling_shielded_data {
-                    Some(sd) => writer.write_all(&<[u8; 64]>::from(sd.binding_sig)[..])?,
-                    None => {}
+                if let Some(shielded_data) = sapling_shielded_data {
+                    writer.write_all(&<[u8; 64]>::from(shielded_data.binding_sig)[..])?;
                 }
             }
 
diff --git a/zebra-test/src/lib.rs b/zebra-test/src/lib.rs
index 196b345d887..a02d268d7cf 100644
--- a/zebra-test/src/lib.rs
+++ b/zebra-test/src/lib.rs
@@ -182,7 +182,7 @@ struct SkipTestReturnedErrPanicMessages;
 impl PanicMessage for SkipTestReturnedErrPanicMessages {
     fn display(
         &self,
-        pi: &std::panic::PanicInfo<'_>,
+        pi: &std::panic::PanicHookInfo<'_>,
         f: &mut std::fmt::Formatter<'_>,
     ) -> std::fmt::Result {
         let payload = pi