diff --git a/Makefile b/Makefile
index 662bee4..7f6edaa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 EXAMPLE_FILES := HelloWorld ServerName EchoServer BroadcastingEchoServer UpgradeSync UpgradeAsync
 THREADED_EXAMPLE_FILES := HelloWorldThreaded EchoServerThreaded
-override CXXFLAGS += -lpthread -Wextra -std=c++17 -Isrc -IuSockets/src
+override CXXFLAGS += -lpthread -Wpedantic -Wall -Wextra -std=c++2a -Isrc -IuSockets/src
 override LDFLAGS += uSockets/*.o -lz
 
 DESTDIR ?=
diff --git a/src/HttpParser.h b/src/HttpParser.h
index 5b69b70..53dc07c 100644
--- a/src/HttpParser.h
+++ b/src/HttpParser.h
@@ -221,7 +221,7 @@ private:
             consumedTotal += consumed;
 
             /* Strip away tail of first "header value" aka URL */
-            req->headers->value = std::string_view(req->headers->value.data(), std::max<size_t>(0, req->headers->value.length() - 9));
+            req->headers->value = std::string_view(req->headers->value.data(), (size_t) std::max<int>(0, (int) req->headers->value.length() - 9));
 
             /* Add all headers to bloom filter */
             req->bf.reset();