diff --git a/libnfc/chips/pn53x.c b/libnfc/chips/pn53x.c
index 4dc2a154..90df2aba 100644
--- a/libnfc/chips/pn53x.c
+++ b/libnfc/chips/pn53x.c
@@ -2655,7 +2655,8 @@ pn53x_target_receive_bytes(struct nfc_device *pnd, uint8_t *pbtRx, const size_t
             return pnd->last_error;
           }
         }
-      // NO BREAK
+        abtCmd[0] = TgGetInitiatorCommand;
+        break;
       case NMT_JEWEL:
       case NMT_BARCODE:
       case NMT_ISO14443B:
@@ -2762,7 +2763,8 @@ pn53x_target_send_bytes(struct nfc_device *pnd, const uint8_t *pbtTx, const size
             return pnd->last_error;
           }
         }
-      // NO BREAK
+        abtCmd[0] = TgResponseToInitiator;
+        break;
       case NMT_JEWEL:
       case NMT_BARCODE:
       case NMT_ISO14443B:
diff --git a/utils/nfc-mfclassic.c b/utils/nfc-mfclassic.c
index 3b12cd8d..faa4dc54 100644
--- a/utils/nfc-mfclassic.c
+++ b/utils/nfc-mfclassic.c
@@ -73,7 +73,6 @@ static bool bFormatCard;
 static bool magic2 = false;
 static bool magic3 = false;
 static bool unlocked = false;
-static bool bForceSizeMismatch;
 static uint8_t uiBlocks;
 static uint8_t keys[] = {
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff,