diff --git a/libraries/FatFSUSB/examples/Listfiles-USB/Listfiles-USB.ino b/libraries/FatFSUSB/examples/Listfiles-USB/Listfiles-USB.ino
index c7567d35e..33fbd839b 100644
--- a/libraries/FatFSUSB/examples/Listfiles-USB/Listfiles-USB.ino
+++ b/libraries/FatFSUSB/examples/Listfiles-USB/Listfiles-USB.ino
@@ -78,7 +78,7 @@ void printDirectory(String dirName, int numTabs) {
       // no more files
       break;
     }
-    for (uint8_t i = 0; i < numTabs; i++) {
+    for (int i = 0; i < numTabs; i++) {
       Serial.print('\t');
     }
     Serial.print(dir.fileName());
diff --git a/libraries/PDM/src/rp2040/OpenPDMFilter.c b/libraries/PDM/src/rp2040/OpenPDMFilter.c
index be932cd4b..e155cbd0b 100644
--- a/libraries/PDM/src/rp2040/OpenPDMFilter.c
+++ b/libraries/PDM/src/rp2040/OpenPDMFilter.c
@@ -140,7 +140,7 @@ void convolve(uint32_t Signal[/* SignalLen */], unsigned short SignalLen,
               uint32_t Result[/* SignalLen + KernelLen - 1 */]) {
     uint16_t n;
 
-    for (n = 0; n < SignalLen + KernelLen - 1; n++) {
+    for (n = 0; n < (uint16_t)(SignalLen + KernelLen - 1); n++) {
         unsigned short kmin, kmax, k;
 
         Result[n] = 0;
@@ -222,7 +222,7 @@ void Open_PDM_Filter_64(uint8_t* data, int16_t* dataOut, uint16_t volume, TPDMFi
     uint8_t j = channels - 1;
 #endif
 
-    for (i = 0, data_out_index = 0; i < Param->nSamples; i++, data_out_index += channels) {
+    for (i = 0, data_out_index = 0; i < (uint8_t)Param->nSamples; i++, data_out_index += channels) {
 #ifdef USE_LUT
         Z0 = filter_tables_64[j](data, 0);
         Z1 = filter_tables_64[j](data, 1);
@@ -269,7 +269,7 @@ void Open_PDM_Filter_128(uint8_t* data, int16_t* dataOut, uint16_t volume, TPDMF
     uint8_t j = channels - 1;
 #endif
 
-    for (i = 0, data_out_index = 0; i < Param->nSamples; i++, data_out_index += channels) {
+    for (i = 0, data_out_index = 0; i < (uint8_t)Param->nSamples; i++, data_out_index += channels) {
 #ifdef USE_LUT
         Z0 = filter_tables_128[j](data, 0);
         Z1 = filter_tables_128[j](data, 1);
diff --git a/libraries/SD/examples/CardInfo/CardInfo.ino b/libraries/SD/examples/CardInfo/CardInfo.ino
index 2aa1aeb8a..ebbbfbe0c 100644
--- a/libraries/SD/examples/CardInfo/CardInfo.ino
+++ b/libraries/SD/examples/CardInfo/CardInfo.ino
@@ -167,7 +167,7 @@ void printDirectory(File dir, int numTabs) {
       // no more files
       break;
     }
-    for (uint8_t i = 0; i < numTabs; i++) {
+    for (int i = 0; i < numTabs; i++) {
       Serial.print('\t');
     }
     Serial.print(entry.name());
diff --git a/libraries/SD/examples/listfiles/listfiles.ino b/libraries/SD/examples/listfiles/listfiles.ino
index efef1fde0..15553d01b 100644
--- a/libraries/SD/examples/listfiles/listfiles.ino
+++ b/libraries/SD/examples/listfiles/listfiles.ino
@@ -110,7 +110,7 @@ void printDirectory(File dir, int numTabs) {
       // no more files
       break;
     }
-    for (uint8_t i = 0; i < numTabs; i++) {
+    for (int i = 0; i < numTabs; i++) {
       Serial.print('\t');
     }
     Serial.print(entry.name());
diff --git a/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino b/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino
index a84a8a57a..036c6ff25 100644
--- a/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino
+++ b/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino
@@ -97,7 +97,7 @@ void handleNotFound() {
   message += server.args();
   message += "\n";
 
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
 
diff --git a/libraries/WebServer/examples/FSBrowser/FSBrowser.ino b/libraries/WebServer/examples/FSBrowser/FSBrowser.ino
index 5a2c18569..181a9c871 100644
--- a/libraries/WebServer/examples/FSBrowser/FSBrowser.ino
+++ b/libraries/WebServer/examples/FSBrowser/FSBrowser.ino
@@ -508,7 +508,7 @@ void handleNotFound() {
   message += F("\nArguments: ");
   message += server.args();
   message += '\n';
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += F(" NAME:");
     message += server.argName(i);
     message += F("\n VALUE:");
diff --git a/libraries/WebServer/examples/Filters/Filters.ino b/libraries/WebServer/examples/Filters/Filters.ino
index b9cd80d93..7aca80f23 100644
--- a/libraries/WebServer/examples/Filters/Filters.ino
+++ b/libraries/WebServer/examples/Filters/Filters.ino
@@ -37,7 +37,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WebServer/examples/HelloServer/HelloServer.ino b/libraries/WebServer/examples/HelloServer/HelloServer.ino
index bdd328ab0..7770b282c 100644
--- a/libraries/WebServer/examples/HelloServer/HelloServer.ino
+++ b/libraries/WebServer/examples/HelloServer/HelloServer.ino
@@ -31,7 +31,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino b/libraries/WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino
index 6e4cf06a8..d8ce9d244 100644
--- a/libraries/WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino
+++ b/libraries/WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino
@@ -97,7 +97,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
+  for (int i = 0; i < server.args(); i++) { message += " " + server.argName(i) + ": " + server.arg(i) + "\n"; }
   server.send(404, "text/plain", message);
   digitalWrite(led, 0);
 }
diff --git a/libraries/WebServer/examples/PostServer/PostServer.ino b/libraries/WebServer/examples/PostServer/PostServer.ino
index 7aff4a1de..d0bdc82c0 100644
--- a/libraries/WebServer/examples/PostServer/PostServer.ino
+++ b/libraries/WebServer/examples/PostServer/PostServer.ino
@@ -62,7 +62,7 @@ void handleForm() {
   } else {
     digitalWrite(led, 1);
     String message = "POST form was:\n";
-    for (uint8_t i = 0; i < server.args(); i++) {
+    for (int i = 0; i < server.args(); i++) {
       message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
     }
     server.send(200, "text/plain", message);
@@ -80,7 +80,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WebServer/examples/SimpleAuthentication/SimpleAuthentication.ino b/libraries/WebServer/examples/SimpleAuthentication/SimpleAuthentication.ino
index cc7025e9e..126b0d2d2 100644
--- a/libraries/WebServer/examples/SimpleAuthentication/SimpleAuthentication.ino
+++ b/libraries/WebServer/examples/SimpleAuthentication/SimpleAuthentication.ino
@@ -92,7 +92,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino b/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino
index 133ca97e5..4dd2e528e 100644
--- a/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino
+++ b/libraries/WebServer/examples/UploadHugeFile/UploadHugeFile.ino
@@ -56,7 +56,7 @@ void handleNotFound() {
   message += "\nArguments: ";
   message += server.args();
   message += "\n";
-  for (uint8_t i = 0; i < server.args(); i++) {
+  for (int i = 0; i < server.args(); i++) {
     message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
   }
   server.send(404, "text/plain", message);
diff --git a/libraries/WiFi/src/WiFiClientSecureBearSSL.cpp b/libraries/WiFi/src/WiFiClientSecureBearSSL.cpp
index 3f86baa40..9211c031a 100644
--- a/libraries/WiFi/src/WiFiClientSecureBearSSL.cpp
+++ b/libraries/WiFi/src/WiFiClientSecureBearSSL.cpp
@@ -529,8 +529,7 @@ int WiFiClientSecureCtx::_run_until(unsigned target, bool blocking) {
                     wait for it.
                 */
                 return -1;
-            }
-            if (wlen > 0) {
+            } else {
                 br_ssl_engine_sendrec_ack(_eng, wlen);
             }
             no_work = 0;