diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index a3c075f8f..de0ec875e 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -389,8 +389,9 @@ static void printConnSpeed(uint32_t wait) {
 
     Dbprintf("  Time elapsed................... %dms", delta_time);
     Dbprintf("  Bytes transferred.............. %d", bytes_transferred);
-    Dbprintf("  Transfer Speed PM3 -> Client... " _YELLOW_("%llu") " bytes/s", 1000 * (uint64_t)bytes_transferred / delta_time);
-}
+    if (delta_time) {
+        Dbprintf("  Transfer Speed PM3 -> Client... " _YELLOW_("%llu") " bytes/s", 1000 * (uint64_t)bytes_transferred / delta_time);
+    }
 
 /**
   * Prints runtime information about the PM3.
diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c
index d36b1aab4..056ee8f05 100644
--- a/client/src/cmdhfmf.c
+++ b/client/src/cmdhfmf.c
@@ -8256,6 +8256,8 @@ static int CmdHF14AGen4ChangePwd(const char *Cmd) {
 
     bool verbose = arg_get_lit(ctx, 3);
 
+    CLIParserFree(ctx);
+
     if (pwd_len != 4) {
         PrintAndLogEx(FAILED, "Old password must be 4 bytes long, got " _YELLOW_("%u"), pwd_len);
         return PM3_EINVARG;
@@ -8272,8 +8274,7 @@ static int CmdHF14AGen4ChangePwd(const char *Cmd) {
         return res;
     }
 
-    PrintAndLogEx(SUCCESS, "Change password done successfully.");
-
+    PrintAndLogEx(SUCCESS, "Change password ( " _GREEN_("ok") " )");
     return PM3_SUCCESS;
 }