diff --git a/armsrc/Standalone/hf_iceclass.c b/armsrc/Standalone/hf_iceclass.c
index 481475bbc..ea38574db 100644
--- a/armsrc/Standalone/hf_iceclass.c
+++ b/armsrc/Standalone/hf_iceclass.c
@@ -69,7 +69,6 @@
 #define HF_ICALSSS_READSIM_TEMP_MOD_BIN  "iceclass-temp-mod.bin"
 #define HF_ICLASS_FULLSIM_MOD       "iceclass-modified"
 #define HF_ICLASS_FULLSIM_MOD_BIN   HF_ICLASS_FULLSIM_MOD".bin"
-#define HF_ICLASS_FULLSIM_MOD_EML   HF_ICLASS_FULLSIM_MOD".eml"
 #define HF_ICLASS_ATTACK_BIN        "iclass_mac_attack"
 
 #define HF_ICLASS_CC_A              "iceclass_cc_a.bin"
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 54aaa16bd..da2f9255e 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -1060,7 +1060,7 @@ int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeo
 
                 if (dtf->len > dtf->max_len) {
                     ret = PM3_EOVFLOW;
-                    Dbprintf("overflow (%d > %d", dtf->len, dtf->max_len);
+                    Dbprintf("overflow (%d > %d)", dtf->len, dtf->max_len);
                 }
                 break;
             }
@@ -1083,7 +1083,7 @@ int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeo
 
                 if (dt->len > dt->max_len) {
                     ret = PM3_EOVFLOW;
-                    Dbprintf("overflow (%d > %d", dt->len, dt->max_len);
+                    Dbprintf("overflow (%d > %d)", dt->len, dt->max_len);
                 }
                 break;
             }
diff --git a/client/gen_pm3mfsim_script.sh b/client/gen_pm3mfsim_script.sh
index 6947c9bda..fa1ae728e 100644
--- a/client/gen_pm3mfsim_script.sh
+++ b/client/gen_pm3mfsim_script.sh
@@ -30,6 +30,6 @@ fi
 
 rm $2
 echo "hf mf eclr" >> $2
-echo "hf mf eload" $1 >> $2
+echo "hf mf eload -f " $1 >> $2
 echo "hf mf ekeyprn" >> $2
-echo "hf mf sim -u" `cat $1.eml | (read -n 8 uid; echo $uid)` >> $2
+echo "hf mf sim --1k -u" `cat $1.eml | (read -n 8 uid; echo $uid)` >> $2
diff --git a/client/luascripts/hf_mf_tnp3_sim.lua b/client/luascripts/hf_mf_tnp3_sim.lua
index d44a883fd..f04c8d7fa 100644
--- a/client/luascripts/hf_mf_tnp3_sim.lua
+++ b/client/luascripts/hf_mf_tnp3_sim.lua
@@ -87,12 +87,6 @@ local function ExitMsg(msg)
     print()
 end
 
-local function writedumpfile(infile)
-     t = infile:read('*all')
-     len = string.len(t)
-     local len,hex = bin.unpack(('H%d'):format(len),t)
-     return hex
-end
 -- blocks with data
 -- there are two dataareas, in block 8 or block 36,   ( 1==8 ,
 -- checksum type =  0, 1, 2, 3
diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c
index a4f6e5922..861a18201 100644
--- a/client/src/cmdhf15.c
+++ b/client/src/cmdhf15.c
@@ -1249,7 +1249,7 @@ static int CmdHF15EView(const char *Cmd) {
     }
 
     PrintAndLogEx(INFO, "Downloading %u bytes from emulator memory", bytes);
-    if (!GetFromDevice(BIG_BUF_EML, dump, bytes, 0, NULL, 0, NULL, 2500, false)) {
+    if (GetFromDevice(BIG_BUF_EML, dump, bytes, 0, NULL, 0, NULL, 2500, false) == false) {
         PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
         free(dump);
         return PM3_ETIMEOUT;
diff --git a/client/src/cmdlf.c b/client/src/cmdlf.c
index 87095631b..1d57378c7 100644
--- a/client/src/cmdlf.c
+++ b/client/src/cmdlf.c
@@ -1,4 +1,4 @@
-//-----------------------------------------------------------------------------
+// //-----------------------------------------------------------------------------
 // Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -469,7 +469,7 @@ int CmdFlexdemod(const char *Cmd) {
             sum += data[i++];
         }
         bits[bit] = (sum > 0) ? 1 : 0;
-        PrintAndLogEx(NORMAL, "bit %d sum %d", bit, sum);
+        // PrintAndLogEx(NORMAL, "bit %d sum %d", bit, sum);
     }
 
     for (bit = 0; bit < 64; bit++) {