diff --git a/ports/stm32/boards/Passport/modules/data_codecs/psbt_txn_sampler.py b/ports/stm32/boards/Passport/modules/data_codecs/psbt_txn_sampler.py
index 01fd213c..52f0923e 100644
--- a/ports/stm32/boards/Passport/modules/data_codecs/psbt_txn_sampler.py
+++ b/ports/stm32/boards/Passport/modules/data_codecs/psbt_txn_sampler.py
@@ -15,7 +15,7 @@ class PsbtTxnSampler(DataSampler):
     # Return True if it matches or False if not.
     @classmethod
     def sample(cls, data):
-        print('psbt sampler: data={}'.format(b2a_hex(data)))
+        # print('psbt sampler: data={}'.format(b2a_hex(data)))
         if data[0:5] == b'psbt\xff':
             return True
         if data[0:10] == b'70736274ff':        # hex-encoded
diff --git a/ports/stm32/boards/Passport/modules/export.py b/ports/stm32/boards/Passport/modules/export.py
index 074ff216..7b2515ae 100644
--- a/ports/stm32/boards/Passport/modules/export.py
+++ b/ports/stm32/boards/Passport/modules/export.py
@@ -40,7 +40,7 @@ def ms_has_master_xfp(xpubs):
     master_xfp = settings.get('xfp', None)
 
     for xpub in xpubs:
-        (xfp, _) = xpub
+        xfp = xpub[0]
         # print('ms_has_master_xfp: xfp={} master_xfp={}'.format(xfp, master_xfp))
         if xfp == master_xfp:
             # print('Including this one')