diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index 325eed056..54764d223 100644
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -129,7 +129,7 @@ RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time);
 RAMFUNC int ManchesterDecoding(uint8_t bit, uint16_t offset, uint32_t non_real_time);
 
 void RAMFUNC SniffIso14443a(uint8_t param);
-void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data, uint8_t numReads);
+void SimulateIso14443aTag(uint8_t tagType, uint8_t flags, uint8_t *data, uint8_t exitAfterNReads);
 bool SimulateIso14443aInit(int tagType, int flags, uint8_t *data, tag_response_info_t **responses, uint32_t *cuid, uint32_t counters[3], uint8_t tearings[3], uint8_t *pages);
 bool GetIso14443aCommandFromReader(uint8_t *received, uint8_t *par, int *len);
 void iso14443a_antifuzz(uint32_t flags);
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 5050fc117..de7a409bd 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -1602,7 +1602,7 @@ void ReaderIso15693(uint32_t parameter) {
         reply_mix(CMD_ACK, recvlen, 0, 0, NULL, 0);
     } else {
 
-        start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
+        //start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
 
         // we should do a better check than this
         if (recvlen >= 12) {
@@ -1686,7 +1686,7 @@ void SimTagIso15693(uint8_t *uid) {
     enum { NO_FIELD, IDLE, ACTIVATED, SELECTED, HALTED } chip_state = NO_FIELD;
 
     bool button_pressed = false;
-    int vHf = 0; // in mV
+    int vHf; // in mV
 
     bool exit_loop = false;
     while (exit_loop == false) {
@@ -1719,7 +1719,6 @@ void SimTagIso15693(uint8_t *uid) {
         int cmd_len = GetIso15693CommandFromReader(cmd, sizeof(cmd), &reader_eof_time);
         if (cmd_len < 0) {
             button_pressed = true;
-            exit_loop = true;
             break;
         }