diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index be96b3780..4bf93602b 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -1056,9 +1056,14 @@ void BruteforceIso15693Afi(uint32_t speed) {
 		if (recvlen >= 12) {
 			Dbprintf("AFI = %i  UID = %s", i, sprintUID(NULL, buf + 2) );
 		}
+		
+		if (BUTTON_PRESS) {
+			DbpString("button pressed, aborting..");
+			break;
+		}
 	}	
 	
-	Dbprintf("AFI Bruteforcing done.");
+	DbpString("AFI Bruteforcing done.");
 	switch_off();
 }
 
diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index c9ce432c9..8405c96ce 100644
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -99,7 +99,7 @@ int DemodPCF7931(uint8_t **outBlocks) {
 				warnings++;
 				if (warnings > 10)
 				{
-					Dbprintf("Error: too many detection errors, aborting.");
+					Dbprintf("Error: too many detection errors, aborting...");
 					return 0;
 				}
 			}
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index fd9882b37..12bcf71c6 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -685,7 +685,7 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
 	}
 	
 	if(isOK <= 1){
-		PrintAndLog("Failed to obtain CC! Aborting");
+		PrintAndLog("Failed to obtain CC! Aborting...");
 		return false;
 	}
 	return true;