diff --git a/artifacts/program_methods/associated_token_account.bin b/artifacts/program_methods/associated_token_account.bin
index 46326067..be94122a 100644
Binary files a/artifacts/program_methods/associated_token_account.bin and b/artifacts/program_methods/associated_token_account.bin differ
diff --git a/nssa/src/privacy_preserving_transaction/witness_set.rs b/nssa/src/privacy_preserving_transaction/witness_set.rs
index 2cd19aac..d498cb32 100644
--- a/nssa/src/privacy_preserving_transaction/witness_set.rs
+++ b/nssa/src/privacy_preserving_transaction/witness_set.rs
@@ -14,7 +14,6 @@ pub struct WitnessSet {
 impl WitnessSet {
     #[must_use]
     // TODO: swap for Keycard signing path.
-    // However. we may need to get signatures from Keycard.
     pub fn for_message(message: &Message, proof: Proof, private_keys: &[&PrivateKey]) -> Self {
         let message_hash = message.hash_message();
         let signatures_and_public_keys = private_keys
diff --git a/wallet/src/chain_storage.rs b/wallet/src/chain_storage.rs
index a3634367..02c87ef8 100644
--- a/wallet/src/chain_storage.rs
+++ b/wallet/src/chain_storage.rs
@@ -72,7 +72,7 @@ impl WalletChainStore {
                     public_tree.insert(
                         data.account_id,
                         data.chain_index,
-                        data.data.expect("Expect valid public account keys"),
+                        data.data.expect("`chain_storage::WalletChainStore::new()`: failed to produce a Key Tree for a PersistentAccountData."),
                     );
                 }
                 PersistentAccountData::Private(data) => {