diff --git a/components/raop/rtp.c b/components/raop/rtp.c
index b2b7acfe..05944fb6 100644
--- a/components/raop/rtp.c
+++ b/components/raop/rtp.c
@@ -38,6 +38,7 @@
 #include <sys/stat.h>
 #include <stdint.h>
 #include <fcntl.h>
+#include <assert.h>
 
 #include "platform.h"
 #include "rtp.h"
@@ -48,12 +49,10 @@
 #ifdef WIN32
 #include <openssl/aes.h>
 #include "alac_wrapper.h"
-#include "assert.h"
 #define MSG_DONTWAIT 0
 #else
 #include "esp_pthread.h"
 #include "esp_system.h"
-#include "esp_assert.h"
 #include <mbedtls/version.h>
 #include <mbedtls/aes.h>
 #include "alac_wrapper.h"
@@ -721,7 +720,7 @@ static void rtp_thread_func(void *arg) {
 				  The expected elapsed remote time should be exactly the same as
 				  elapsed local time between the two request, corrected by the
 				  drifting
-				  u64_t expected = ctx->timing.remote + MS2NTP(reference - ctx->timing.local);
+				u64_t expected = ctx->timing.remote + MS2NTP(reference - ctx->timing.local);
 				*/
 
 				ctx->timing.remote = remote;
diff --git a/components/squeezelite/output_i2s.c b/components/squeezelite/output_i2s.c
index 4a7aa394..8bd5d30c 100644
--- a/components/squeezelite/output_i2s.c
+++ b/components/squeezelite/output_i2s.c
@@ -579,7 +579,6 @@ static void output_thread_i2s_stats(void *arg) {
 		}
 		vTaskDelay( pdMS_TO_TICKS( STATS_PERIOD_MS ) );
 	}
-	return;
 }
 
 /****************************************************************************************