diff --git a/lib/map.c b/lib/map.c
index 370040e..e6c8da5 100644
--- a/lib/map.c
+++ b/lib/map.c
@@ -31,7 +31,7 @@ char *map_getValue(Map m, char *key) {
 }
 
 void map_dump(Map m) {
-    for (int i = 0; i < m.length; ++i) {
+    for (size_t i = 0; i < m.length; ++i) {
         printf("%s %s\n", m.pairs[i].key, m.pairs[i].value);
     }
 }
diff --git a/modules/peer.c b/modules/peer.c
index 57febb8..0939238 100644
--- a/modules/peer.c
+++ b/modules/peer.c
@@ -116,7 +116,6 @@ int peer_HandleConnection(SOCKET listening, PeerList *peerList, Node_data my, fd
     SOCKET sock = accept(listening, (struct sockaddr*)& client, &clientSize);
 
     char ip[NI_MAXHOST];
-    char service[NI_MAXSERV];
 
     memset(ip,0, NI_MAXHOST);
 
@@ -182,7 +181,7 @@ int peer_HandleConnection(SOCKET listening, PeerList *peerList, Node_data my, fd
         strcat(handshake,buf);
     }
     char peers[DEFAULT_BUFLEN] = "&peers=";
-    for (int i = 0; i < peerList->length; ++i) {
+    for (size_t i = 0; i < peerList->length; ++i) {
         strcat(peers,peerList->array[i].peerData.ip);
         strcat(peers,":");
 
@@ -223,7 +222,7 @@ void peer_initList(PeerList *list){
 
 
 bool peer_ID_isFound(PeerList list, char* id){
-    for(int i=0;i < list.length;++i){
+    for(size_t i=0;i < list.length;++i){
         if(strcmp(list.array[i].peerData.id,id)==0) {
             return true;
         }
@@ -231,7 +230,7 @@ bool peer_ID_isFound(PeerList list, char* id){
     return false;
 }
 bool peer_IP_isFound(struct PeerList list, char* ip, int port){
-    for(int i=0;i < list.length;++i){
+    for(size_t i=0;i < list.length;++i){
         if(strcmp(list.array[i].peerData.ip,ip) == 0 && list.array[i].peerData.port == port) {
             return true;
         }
@@ -255,13 +254,13 @@ void peer_addTolist(PeerList *list, struct peer p){
 }
 void peer_removeFromList(struct PeerList* list, int i){
     closesocket(list->array[i].socket);
-    for (int k=i; k < list->length-1; ++k)
+    for (size_t k=i; k < list->length-1; ++k)
         list->array[k] =list->array[k+1];
     list->length--;
 }
 
 int peer_getPeer(struct PeerList list, SOCKET socket){
-    for (int i = 0; i < list.length; ++i) {
+    for (size_t i = 0; i < list.length; ++i) {
         if(list.array[i].socket == socket)
             return i;
     }
@@ -269,7 +268,7 @@ int peer_getPeer(struct PeerList list, SOCKET socket){
 }
 
 int peer_ID_getPeer(struct PeerList list, char* c) {
-    for (int i = 0; i < list.length; ++i) {
+    for (size_t i = 0; i < list.length; ++i) {
         if(strcmp(list.array[i].peerData.id,c) == 0)
             return i;
     }
diff --git a/modules/server.c b/modules/server.c
index 876d014..9fde38b 100644
--- a/modules/server.c
+++ b/modules/server.c
@@ -80,7 +80,7 @@ void serverThread(SOCKET listening, fd_set *master, WebIO webIo, PeerList* list,
                     int k = peer_getPeer(*list, sock);
                     sprintf(file, "%speers/", webIo.folder);
 #if defined(_WIN32)
-                    mkdir(file);
+                    CreateDirectoryA(file,NULL);
 #else
                     mkdir(file, 0777);
 #endif
diff --git a/modules/webio.c b/modules/webio.c
index a5f6cf2..d34ccc8 100644
--- a/modules/webio.c
+++ b/modules/webio.c
@@ -211,7 +211,7 @@ static int webio_handlePOSTrequest(SOCKET client, WebIO wio, Map post) {
         char folder[72];
         sprintf(folder, "%s/peers/", wio.folder);
 #if defined(_WIN32)
-        mkdir(folder);
+        CreateDirectoryA(folder,NULL);
 #else
         mkdir(folder, 0777);
 #endif
@@ -267,7 +267,7 @@ static void webio_getIndex(WebIO wio, char *outputBuffer) {
     strcat(content, "<h1>Peers:</h1>\n");
     if (wio.list->length > 0) {
         strcat(content, "<ul>\n");
-        for (int i = 0; i < wio.list->length; ++i) {
+        for (size_t i = 0; i < wio.list->length; ++i) {
             sprintf(content, "%s<li>"
                              "<a href=\"%s\">",
                     content, wio.list->array[i].peerData.id);