diff --git a/client/src/cmddata.h b/client/src/cmddata.h
index 5b19b0f4e..5f70516ff 100644
--- a/client/src/cmddata.h
+++ b/client/src/cmddata.h
@@ -67,7 +67,6 @@ int CmdLtrim(const char *Cmd);
 int CmdNorm(const char *Cmd);                                                                   // used by cmd lf data (!)
 int CmdPlot(const char *Cmd);                                                                   // used by cmd lf cotag
 int CmdSave(const char *Cmd);                                                                   // used by cmd auto
-int CmdTuneSamples(const char *Cmd);                                                            // used by cmd lf hw
 
 int ASKbiphaseDemod(int offset, int clk, int invert, int maxErr, bool verbose);                 // used by cmd lf em4x, lf fdxb, lf guard, lf jablotron, lf nedap, lf t55xx
 int ASKDemod(int clk, int invert, int maxErr, size_t maxlen, bool amplify, bool verbose, bool emSearch, uint8_t askType);                    // used by cmd lf em4x, lf t55xx, lf viking
diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c
index dd07c9ab0..356817877 100644
--- a/client/src/cmdhfmf.c
+++ b/client/src/cmdhfmf.c
@@ -1128,9 +1128,9 @@ static int mf_load_keys(uint8_t **pkeyBlock, uint32_t *pkeycnt, uint8_t *userkey
         }
         *pkeyBlock = p;
         // Copy default keys to list
-        for (int i = 0; i < ARRAYLEN(g_mifare_default_keys); i++) {
+        for (uint32_t i = 0; i < ARRAYLEN(g_mifare_default_keys); i++) {
             num_to_bytes(g_mifare_default_keys[i], MIFARE_KEY_SIZE, (uint8_t *)(*pkeyBlock + (*pkeycnt + i) * MIFARE_KEY_SIZE));
-            PrintAndLogEx(DEBUG, _YELLOW_("%2d") " - %s", *pkeycnt + i, sprint_hex(*pkeyBlock + (*pkeycnt + i) * MIFARE_KEY_SIZE, MIFARE_KEY_SIZE));
+            PrintAndLogEx(DEBUG, _YELLOW_("%2u") " - %s", *pkeycnt + i, sprint_hex(*pkeyBlock + (*pkeycnt + i) * MIFARE_KEY_SIZE, MIFARE_KEY_SIZE));
         }
         *pkeycnt += ARRAYLEN(g_mifare_default_keys);
         PrintAndLogEx(SUCCESS, "loaded " _GREEN_("%zu") " hardcoded keys", ARRAYLEN(g_mifare_default_keys));
@@ -10403,6 +10403,7 @@ static int CmdHF14AMfInfo(const char *Cmd) {
         }
     }
 
+
     if (fKeyType != 0xFF) {
         PrintAndLogEx(SUCCESS, "Block 0.......... %s | " NOLF, sprint_hex_inrow(blockdata, MFBLOCK_SIZE));
         PrintAndLogEx(NORMAL, "%s", sprint_ascii(blockdata + 8, 8));