diff --git a/src/HttpServer.c b/src/HttpServer.c
index bdf5d2d..475fe58 100644
--- a/src/HttpServer.c
+++ b/src/HttpServer.c
@@ -287,7 +287,7 @@ HttpServerCreate(unsigned short port, unsigned int nThreads, unsigned int maxCon
                  HttpHandler * requestHandler, void *handlerArgs)
 {
     HttpServer *server;
-    struct sockaddr_in sa = {0};
+    struct sockaddr_in sa;
 
     if (!requestHandler)
     {
@@ -343,6 +343,8 @@ HttpServerCreate(unsigned short port, unsigned int nThreads, unsigned int maxCon
     }
 #endif
 
+    memset(&sa, 0, sizeof(struct sockaddr_in));
+
     sa.sin_family = AF_INET;
     sa.sin_port = htons(port);
     sa.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -553,7 +555,7 @@ HttpServerWorkerThread(void *args)
                     break;
                 }
 
-                line[i] = tolower(line[i]);
+                line[i] = tolower((unsigned char) line[i]);
             }
 
             headerKey = Malloc((i + 1) * sizeof(char));