diff --git a/client/cmdhf14a.h b/client/cmdhf14a.h
index 163b6af2..d2e203a1 100644
--- a/client/cmdhf14a.h
+++ b/client/cmdhf14a.h
@@ -20,5 +20,5 @@ int CmdHF14AReader(const char *Cmd);
 int CmdHF14ASim(const char *Cmd);
 int CmdHF14ASnoop(const char *Cmd);
 
-static char* getTagInfo(uint8_t uid);
+
 #endif
diff --git a/client/cmdmain.c b/client/cmdmain.c
index ee39acc0..82d0d740 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -131,13 +131,12 @@ int getCommand(UsbCommand* response)
  */
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
   
-
+	UsbCommand resp;
 	if (response == NULL)
-    response = &resp;
+		response = &resp;
 
-
-  // Wait until the command is received
-  for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
+	  // Wait until the command is received
+	  for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
 
 		while(getCommand(response)) {
           if(response->cmd == cmd){
diff --git a/client/nonce2key/crapto1.c b/client/nonce2key/crapto1.c
index fafbd426..6c0fcafa 100644
--- a/client/nonce2key/crapto1.c
+++ b/client/nonce2key/crapto1.c
@@ -551,8 +551,6 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8],
                 return 0;
 	}
 
-	}
-
 	s = statelist;
 	for(o = odd; *o != -1; ++o)
 		for(e = even; *e != -1; ++e)