diff --git a/core/src/dap_json_rpc_errors.c b/core/src/dap_json_rpc_errors.c
index ef0610a0c927a0ea5c582eca4fc1a1ca20774a4f..3bd293035d5eb7c023affa1b2ec85495d5e028d9 100644
--- a/core/src/dap_json_rpc_errors.c
+++ b/core/src/dap_json_rpc_errors.c
@@ -2,7 +2,7 @@
 
 #define LOG_TAG "dap_json_rpc_errors"
 
-static dap_json_rpc_error_t *s_errors;
+static _Thread_local dap_json_rpc_error_t *s_errors;
 int _dap_json_rpc_error_cmp_by_code(dap_json_rpc_error_t *a_error, int a_code_error);
 
 int dap_json_rpc_error_init(void)
@@ -21,6 +21,7 @@ void dap_json_rpc_error_deinit(void)
             DAP_FREE(err);
         }
     }
+    s_errors = NULL;
 }
 
 dap_json_rpc_error_JSON_t * dap_json_rpc_error_JSON_create()
diff --git a/io/include/dap_events_socket.h b/io/include/dap_events_socket.h
index 408f89654c72da01d1a2198adffbbb3390e77540..6624e8e28119beae7dd1bd54c4a49f0b94a303f1 100644
--- a/io/include/dap_events_socket.h
+++ b/io/include/dap_events_socket.h
@@ -329,7 +329,7 @@ typedef struct dap_events_socket {
 
     int64_t kqueue_data;
 #elif defined DAP_EVENTS_CAPS_IOCP
-    byte_t pending : 7, pending_read : 1;
+    uint_fast16_t pending : 15, pending_read : 1;
 #endif
 
     dap_events_socket_callbacks_t callbacks;