diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c
index f1673cfb5..ed4947377 100644
--- a/client/src/cmdhfmfdes.c
+++ b/client/src/cmdhfmfdes.c
@@ -4820,7 +4820,7 @@ static int CmdHF14aDesNDEF(const char *Cmd) {
     void *argtable[] = {
         arg_param_begin,
         arg_litn("v",  "verbose",  0, 2, "show technical data"),
-        arg_str0("",    "aid",      "<aid>", "replace default aid for NDEF"),
+        arg_str0(NULL, "aid",      "<aid>", "replace default aid for NDEF"),
         arg_str0("k",  "key",      "<key>", "replace default key for NDEF"),
         arg_param_end
     };
@@ -4924,7 +4924,7 @@ static int CmdHF14aDesMAD(const char *Cmd) {
     void *argtable[] = {
         arg_param_begin,
         arg_litn("v",  "verbose",  0, 2, "show technical data"),
-        arg_str0("",    "aid",      "<aid>", "replace default aid for MAD"),
+        arg_str0(NULL, "aid",      "<aid>", "replace default aid for MAD"),
         arg_str0("k",  "key",      "<key>", "replace default key for MAD"),
         arg_param_end
     };
diff --git a/client/src/cmdlfem4x05.c b/client/src/cmdlfem4x05.c
index 82acb5bb6..f43e163bb 100644
--- a/client/src/cmdlfem4x05.c
+++ b/client/src/cmdlfem4x05.c
@@ -1533,7 +1533,7 @@ int CmdEM4x05Unlock(const char *Cmd) {
         arg_int0("n", NULL, NULL, "steps to skip"),
         arg_int0("s", "start", "<us>", "start scan from delay (us)"),
         arg_int0("e", "end", "<us>", "end scan at delay (us)"),
-        arg_str0("p", "pwd", "", "password (00000000)"),
+        arg_str0("p", "pwd", "<hex>", "password (def 00000000)"),
         arg_lit0("v", "verbose", "verbose output"),
         arg_param_end
     };
diff --git a/client/src/cmdmain.c b/client/src/cmdmain.c
index 5c4152604..b31b14836 100644
--- a/client/src/cmdmain.c
+++ b/client/src/cmdmain.c
@@ -129,7 +129,7 @@ static int CmdAuto(const char *Cmd) {
 
     void *argtable[] = {
         arg_param_begin,
-        arg_lit0("a", "all", ""),
+        arg_lit0("c", NULL, "Continue searching even after a first hit"),
         arg_param_end
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);