diff --git a/Makefile b/Makefile
index 0ab4d35..53bd168 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 -Wconversion -std=c++17 -Isrc -IuSockets/src
+override CXXFLAGS += -lpthread -Wall -std=c++17 -Isrc -IuSockets/src
 override LDFLAGS += uSockets/*.o -lz
 
 DESTDIR ?=
diff --git a/src/QueryParser.h b/src/QueryParser.h
index 38afd28..552bb56 100644
--- a/src/QueryParser.h
+++ b/src/QueryParser.h
@@ -59,7 +59,7 @@ namespace uWS {
                         unsigned int out = 0;
 
                         /* Walk over all chars until end or null char, decoding in place */
-                        for (int i = 0; i < statementValue.length() && in[i]; i++) {
+                        for (unsigned int i = 0; i < statementValue.length() && in[i]; i++) {
                                 /* Only bother with '%' */
                                 if (in[i] == '%') {
                                     /* Do we have enough data for two bytes hex? */