diff --git a/koboldcpp.py b/koboldcpp.py
index e10641e25..a18f9feae 100644
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -1073,7 +1073,7 @@ def RunServerMultiThreaded(addr, port, embedded_kailite = None, embedded_kcpp_do
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     sock.bind((addr, port))
-    sock.listen(5)
+    sock.listen(12)
 
     class Thread(threading.Thread):
         def __init__(self, i):
diff --git a/otherarch/rwkv_v3.cpp b/otherarch/rwkv_v3.cpp
index a9982fd26..93dbbf5f9 100644
--- a/otherarch/rwkv_v3.cpp
+++ b/otherarch/rwkv_v3.cpp
@@ -130,17 +130,17 @@ inline enum rwkv_error_flags operator|=(enum rwkv_error_flags & a, enum rwkv_err
     } } while (0)
 
 #define RWKV_ASSERT_FALSE_MSG(ERR_VAL, x, ...) RWKV_ASSERT_MSG(ERR_VAL, false, x, __VA_ARGS__)
-#define RWKV_ASSERT_NULL_MSG(ERR_VAL, x, ...) RWKV_ASSERT_MSG(ERR_VAL, NULL, x, __VA_ARGS__)
+#define RWKV_ASSERT_NULL_MSG(ERR_VAL, x, ...) RWKV_ASSERT_MSG(ERR_VAL, 0, x, __VA_ARGS__)
 
 #define RWKV_CTX_ASSERT_FALSE_MSG(ctx, ERR_VAL, x, ...) RWKV_CTX_ASSERT_MSG(ctx, ERR_VAL, false, x, __VA_ARGS__)
 
 #define RWKV_ASSERT_FALSE(ERR_VAL, x) RWKV_ASSERT(ERR_VAL, false, x)
-#define RWKV_ASSERT_NULL(ERR_VAL, x) RWKV_ASSERT(ERR_VAL, NULL, x)
+#define RWKV_ASSERT_NULL(ERR_VAL, x) RWKV_ASSERT(ERR_VAL, 0, x)
 
 #define RWKV_CTX_ASSERT_FALSE(ctx, ERR_VAL, x) RWKV_CTX_ASSERT(ctx, ERR_VAL, false, x)
 
 #define RWKV_ENSURE_OR_FALSE(x) RWKV_ENSURE(false, x)
-#define RWKV_ENSURE_OR_NULL(x) RWKV_ENSURE(NULL, x)
+#define RWKV_ENSURE_OR_NULL(x) RWKV_ENSURE(0, x)
 #define RWKV_ENSURE_OR_FALSE_MSG(x, ...) RWKV_ENSURE_MSG(false, x, __VA_ARGS__)
 
 // --- Utilities ---