diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp
index 636f4a95..e717d7f8 100644
--- a/ESP32_AP-Flasher/src/contentmanager.cpp
+++ b/ESP32_AP-Flasher/src/contentmanager.cpp
@@ -82,7 +82,6 @@ void contentRunner() {
             if (minutesUntilNextUpdate > 1 && (wsClientCount() == 0 || config.stopsleep == 0)) {
                 taginfo->pendingIdle = minutesUntilNextUpdate * 60;
                 if (taginfo->isExternal == false) {
-                    Serial.printf("sleeping for %d more minutes\n", minutesUntilNextUpdate);
                     prepareIdleReq(taginfo->mac, minutesUntilNextUpdate);
                 }
             }
diff --git a/ESP32_AP-Flasher/src/newproto.cpp b/ESP32_AP-Flasher/src/newproto.cpp
index 5891d680..fb4bdcb8 100644
--- a/ESP32_AP-Flasher/src/newproto.cpp
+++ b/ESP32_AP-Flasher/src/newproto.cpp
@@ -74,15 +74,15 @@ void prepareCancelPending(const uint8_t dst[8]) {
 }
 
 void prepareIdleReq(const uint8_t* dst, uint16_t nextCheckin) {
-    if (nextCheckin > 0) {
+    if (nextCheckin > 0 && countQueueItem(dst) == 0) {
         struct pendingData pending = {0};
         memcpy(pending.targetMac, dst, 8);
         pending.availdatainfo.dataType = DATATYPE_NOUPDATE;
         pending.availdatainfo.nextCheckIn = nextCheckin;
         pending.attemptsLeft = 10 + config.maxsleep;
 
-        Serial.printf(">SDA %02X%02X%02X%02X%02X%02X%02X%02X NOP\n", dst[7], dst[6], dst[5], dst[4], dst[3], dst[2], dst[1], dst[0]);
-        queueDataAvail(&pending, true);
+        Serial.printf(">SDA %02X%02X%02X%02X%02X%02X%02X%02X sleeping %d minutes\n", dst[7], dst[6], dst[5], dst[4], dst[3], dst[2], dst[1], dst[0], nextCheckin);
+        sendDataAvail(&pending);
     }
 }
 
@@ -508,10 +508,16 @@ void processDataReq(struct espAvailDataReq* eadr, bool local, IPAddress remoteIP
     }
     char buffer[64];
 
+    char hexmac[17];
+    mac2hex(eadr->src, hexmac);
+
     tagRecord* taginfo = tagRecord::findByMAC(eadr->src);
     if (taginfo == nullptr) {
         if (config.lock == 1 || (config.lock == 2 && eadr->adr.wakeupReason != WAKEUP_REASON_FIRSTBOOT)) return;
-        if (eadr->adr.currentChannel > 0 && eadr->adr.currentChannel != apInfo.channel) return;
+        if (eadr->adr.currentChannel > 0 && eadr->adr.currentChannel != apInfo.channel) {
+            Serial.printf("Tag %s reports illegal channel %d\n", hexmac, eadr->adr.currentChannel);
+            return;
+        }
         taginfo = new tagRecord;
         memcpy(taginfo->mac, eadr->src, sizeof(taginfo->mac));
         taginfo->pendingCount = 0;
@@ -520,9 +526,6 @@ void processDataReq(struct espAvailDataReq* eadr, bool local, IPAddress remoteIP
     time_t now;
     time(&now);
 
-    char hexmac[17];
-    mac2hex(eadr->src, hexmac);
-
     if (!local) {
         if (taginfo->isExternal == false) {
             wsLog("moved AP from local to external " + String(hexmac));
diff --git a/ESP32_AP-Flasher/src/system.cpp b/ESP32_AP-Flasher/src/system.cpp
index 95e4732c..65e8eca8 100644
--- a/ESP32_AP-Flasher/src/system.cpp
+++ b/ESP32_AP-Flasher/src/system.cpp
@@ -57,7 +57,10 @@ void logLine(const String& text) {
             contentFS->remove("/logold.txt");
             contentFS->rename("/log.txt", "/logold.txt");
             logFile = contentFS->open("/log.txt", "a");
-            if (!logFile) return;
+            if (!logFile) {
+                xSemaphoreGive(fsMutex);
+                return;
+            }
         }
 
         logFile.print(timeStr);