diff --git a/mongoose.c b/mongoose.c
index 9a6a26b9..af4ced9c 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -1006,7 +1006,7 @@ static int packed_stat(const char *path, size_t *size, time_t *mtime) {
 
 static void packed_list(const char *dir, void (*fn)(const char *, void *),
                         void *userdata) {
-  char buf[256], tmp[sizeof(buf)];
+  char buf[MG_PATH_MAX], tmp[sizeof(buf)];
   const char *path, *begin, *end;
   size_t i, n = strlen(dir);
   tmp[0] = '\0';  // Previously listed entry
@@ -5767,6 +5767,26 @@ size_t mg_ws_send(struct mg_connection *c, const void *buf, size_t len,
   return header_len + len;
 }
 
+static bool mg_ws_client_handshake(struct mg_connection *c) {
+  int n = mg_http_get_request_len(c->recv.buf, c->recv.len);
+  if (n < 0) {
+    mg_error(c, "not http");  // Some just, not an HTTP request
+  } else if (n > 0) {
+    if (n < 15 || memcmp(c->recv.buf + 9, "101", 3) != 0) {
+      mg_error(c, "handshake error");
+    } else {
+      struct mg_http_message hm;
+      mg_http_parse((char *) c->recv.buf, c->recv.len, &hm);
+      c->is_websocket = 1;
+      mg_call(c, MG_EV_WS_OPEN, &hm);
+    }
+    mg_iobuf_del(&c->recv, 0, (size_t) n);
+  } else {
+    return true;  // Request is not yet received, quit event handler
+  }
+  return false;  // Continue event handler
+}
+
 static void mg_ws_cb(struct mg_connection *c, int ev, void *ev_data,
                      void *fn_data) {
   struct ws_msg msg;
@@ -5774,25 +5794,7 @@ static void mg_ws_cb(struct mg_connection *c, int ev, void *ev_data,
 
   // assert(ofs < c->recv.len);
   if (ev == MG_EV_READ) {
-    if (!c->is_websocket && c->is_client) {
-      int n = mg_http_get_request_len(c->recv.buf, c->recv.len);
-      if (n < 0) {
-        c->is_closing = 1;  // Some just, not an HTTP request
-      } else if (n > 0) {
-        if (n < 15 || memcmp(c->recv.buf + 9, "101", 3) != 0) {
-          MG_ERROR(("%lu WS handshake error: %.*s", c->id, 15, c->recv.buf));
-          c->is_closing = 1;
-        } else {
-          struct mg_http_message hm;
-          mg_http_parse((char *) c->recv.buf, c->recv.len, &hm);
-          c->is_websocket = 1;
-          mg_call(c, MG_EV_WS_OPEN, &hm);
-        }
-        mg_iobuf_del(&c->recv, 0, (size_t) n);
-      } else {
-        return;  // A request is not yet received
-      }
-    }
+    if (c->is_client && !c->is_websocket && mg_ws_client_handshake(c)) return;
 
     while (ws_process(c->recv.buf + ofs, c->recv.len - ofs, &msg) > 0) {
       char *s = (char *) c->recv.buf + ofs + msg.header_len;
diff --git a/mongoose.h b/mongoose.h
index 076e7a42..a86d9128 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -690,7 +690,7 @@ int sscanf(const char *, const char *, ...);
 #endif
 
 #ifndef MG_MAX_HTTP_HEADERS
-#define MG_MAX_HTTP_HEADERS 40
+#define MG_MAX_HTTP_HEADERS 30
 #endif
 
 #ifndef MG_HTTP_INDEX
diff --git a/src/config.h b/src/config.h
index 67229c76..be4a7764 100644
--- a/src/config.h
+++ b/src/config.h
@@ -80,7 +80,7 @@
 #endif
 
 #ifndef MG_MAX_HTTP_HEADERS
-#define MG_MAX_HTTP_HEADERS 40
+#define MG_MAX_HTTP_HEADERS 30
 #endif
 
 #ifndef MG_HTTP_INDEX
diff --git a/src/fs_packed.c b/src/fs_packed.c
index 195e9ae7..ef285e3b 100644
--- a/src/fs_packed.c
+++ b/src/fs_packed.c
@@ -42,7 +42,7 @@ static int packed_stat(const char *path, size_t *size, time_t *mtime) {
 
 static void packed_list(const char *dir, void (*fn)(const char *, void *),
                         void *userdata) {
-  char buf[256], tmp[sizeof(buf)];
+  char buf[MG_PATH_MAX], tmp[sizeof(buf)];
   const char *path, *begin, *end;
   size_t i, n = strlen(dir);
   tmp[0] = '\0';  // Previously listed entry
diff --git a/src/ws.c b/src/ws.c
index 9abb8c1c..eace26ef 100644
--- a/src/ws.c
+++ b/src/ws.c
@@ -139,6 +139,26 @@ size_t mg_ws_send(struct mg_connection *c, const void *buf, size_t len,
   return header_len + len;
 }
 
+static bool mg_ws_client_handshake(struct mg_connection *c) {
+  int n = mg_http_get_request_len(c->recv.buf, c->recv.len);
+  if (n < 0) {
+    mg_error(c, "not http");  // Some just, not an HTTP request
+  } else if (n > 0) {
+    if (n < 15 || memcmp(c->recv.buf + 9, "101", 3) != 0) {
+      mg_error(c, "handshake error");
+    } else {
+      struct mg_http_message hm;
+      mg_http_parse((char *) c->recv.buf, c->recv.len, &hm);
+      c->is_websocket = 1;
+      mg_call(c, MG_EV_WS_OPEN, &hm);
+    }
+    mg_iobuf_del(&c->recv, 0, (size_t) n);
+  } else {
+    return true;  // Request is not yet received, quit event handler
+  }
+  return false;  // Continue event handler
+}
+
 static void mg_ws_cb(struct mg_connection *c, int ev, void *ev_data,
                      void *fn_data) {
   struct ws_msg msg;
@@ -146,25 +166,7 @@ static void mg_ws_cb(struct mg_connection *c, int ev, void *ev_data,
 
   // assert(ofs < c->recv.len);
   if (ev == MG_EV_READ) {
-    if (!c->is_websocket && c->is_client) {
-      int n = mg_http_get_request_len(c->recv.buf, c->recv.len);
-      if (n < 0) {
-        c->is_closing = 1;  // Some just, not an HTTP request
-      } else if (n > 0) {
-        if (n < 15 || memcmp(c->recv.buf + 9, "101", 3) != 0) {
-          MG_ERROR(("%lu WS handshake error: %.*s", c->id, 15, c->recv.buf));
-          c->is_closing = 1;
-        } else {
-          struct mg_http_message hm;
-          mg_http_parse((char *) c->recv.buf, c->recv.len, &hm);
-          c->is_websocket = 1;
-          mg_call(c, MG_EV_WS_OPEN, &hm);
-        }
-        mg_iobuf_del(&c->recv, 0, (size_t) n);
-      } else {
-        return;  // A request is not yet received
-      }
-    }
+    if (c->is_client && !c->is_websocket && mg_ws_client_handshake(c)) return;
 
     while (ws_process(c->recv.buf + ofs, c->recv.len - ofs, &msg) > 0) {
       char *s = (char *) c->recv.buf + ofs + msg.header_len;