diff --git a/examples/server.c b/examples/server.c
index f21a2ba53adf99eb20e22f227e2b5fed6ac19aff..dea44a5c99e9e20faa85b0b934266b05ba587d78 100644
--- a/examples/server.c
+++ b/examples/server.c
@@ -25,6 +25,7 @@
 #define _WIN32_WINNT 0x500        // Enable MIIM_BITMAP
 #define _CRT_SECURE_NO_WARNINGS   // Disable deprecation warning in VS2005
 #define _XOPEN_SOURCE 600         // For PATH_MAX on linux
+#undef WIN32_LEAN_AND_MEAN        // Let windows.h always include winsock2.h
 
 #include <sys/stat.h>
 #include <stdio.h>
diff --git a/mongoose.c b/mongoose.c
index e707b75a067dce49272ea2a1d65b113823d0da70..1293719db6da7e3c6bdb38e2efa45b9b61e81d8d 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -2851,7 +2851,7 @@ static void call_request_handler_if_data_is_buffered(struct connection *conn) {
   } else
 #endif
   if ((size_t) loc->len >= c->content_len &&
-      call_request_handler(conn) == MG_REQUEST_NOT_PROCESSED) {
+      call_request_handler(conn) == MG_FALSE) {
     open_local_endpoint(conn, 1);
   }
 }
@@ -4354,7 +4354,6 @@ struct mg_connection *mg_connect(struct mg_server *server, const char *host,
   conn->mg_conn.server_param = server->ns_server.server_data;
   conn->birth_time = time(NULL);
   conn->ns_conn->flags = NSF_CONNECTING;
-  conn->mg_conn.status_code = MG_CONNECT_FAILURE;
 
   return &conn->mg_conn;
 }