diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c
index e04d27774..ce8844aae 100644
--- a/client/src/cmdhfmfdes.c
+++ b/client/src/cmdhfmfdes.c
@@ -5058,7 +5058,7 @@ static int CmdHF14ADesWriteData(const char *Cmd) {
 
         if (verbose) {
             if (readeridpushed)
-                PrintAndLogEx(INFO, "TMC and TMV[%d]: %s", resplen, sprint_hex(resp, resplen));
+                PrintAndLogEx(INFO, "TMC and TMV[%zu]: %s", resplen, sprint_hex(resp, resplen));
             PrintAndLogEx(INFO, "Commit " _GREEN_("OK"));
         }
 
diff --git a/client/src/mifare/lrpcrypto.c b/client/src/mifare/lrpcrypto.c
index 71ddce201..e274b660b 100644
--- a/client/src/mifare/lrpcrypto.c
+++ b/client/src/mifare/lrpcrypto.c
@@ -248,7 +248,7 @@ void LRPCMAC(LRPContext *ctx, uint8_t *data, size_t datalen, uint8_t *cmac) {
 
     size_t bllen = datalen - clen;
     uint8_t bl[CRYPTO_AES128_KEY_SIZE] = {0};
-    memcpy(bl, &data[clen], bllen);
+    memcpy(bl, &data[clen], MIN(bllen, CRYPTO_AES128_KEY_SIZE));
 
     // last block
     if (bllen == 16) {