diff --git a/GNUmakefile b/GNUmakefile
index 24ccbbf0..f575b48a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -60,11 +60,10 @@ CFLAGS += \
 	-ffunction-sections \
 	-fdata-sections \
 	-fno-exceptions \
-	-g \
-	-flto
+	-g
 LDFLAGS += \
-	-flto=auto \
-	-Wno-attributes
+	-Wno-attributes \
+	-flto=auto
 
 ANDROID_MIN_SDK_VERSION := 24
 ANDROID_TARGET_SDK_VERSION := 34
@@ -172,7 +171,9 @@ $(ANDROID_TARGETS): CFLAGS += \
 	-funwind-tables
 $(ANDROID_TARGETS): LDFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC
 $(DEBUG_TARGETS): CFLAGS += -DDEBUG -Og
-$(RELEASE_TARGETS): CFLAGS += -DNDEBUG
+$(RELEASE_TARGETS): CFLAGS += \
+	-DNDEBUG \
+	-flto
 $(NONANDROID_RELEASE_TARGETS): CFLAGS += -O3
 $(ANDROID_RELEASE_TARGETS): CFLAGS += -Oz
 $(WINDOWS_TARGETS): CC = x86_64-w64-mingw32-gcc-win32
diff --git a/src/http.c b/src/http.c
index 4abeeabf..13f521b3 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1071,7 +1071,7 @@ void* tf_http_get_user_data(tf_http_t* http)
 
 const char* tf_http_get_cookie(const char* cookie_header, const char* name)
 {
-	if (!cookie_header)
+	if (!cookie_header || !name)
 	{
 		return NULL;
 	}
diff --git a/src/ssb.c b/src/ssb.c
index 9a530ba5..38d58b00 100644
--- a/src/ssb.c
+++ b/src/ssb.c
@@ -3174,8 +3174,9 @@ static void _tf_ssb_on_broadcast_listener_recv(uv_udp_t* handle, ssize_t nread,
 	tf_free(buf->base);
 }
 
-void tf_ssb_visit_broadcasts(
-	tf_ssb_t* ssb, void (*callback)(const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data), void* user_data)
+void tf_ssb_visit_broadcasts(tf_ssb_t* ssb,
+	void (*callback)(const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data),
+	void* user_data)
 {
 	time_t now = time(NULL);
 	tf_ssb_broadcast_t* next = NULL;
diff --git a/src/ssb.h b/src/ssb.h
index 37ca0cd9..2a84fac4 100644
--- a/src/ssb.h
+++ b/src/ssb.h
@@ -306,8 +306,9 @@ bool tf_ssb_whoami(tf_ssb_t* ssb, char* out_id, size_t out_id_size);
 ** @param callback The callback.
 ** @param user_data User data for the callback.
 */
-void tf_ssb_visit_broadcasts(
-	tf_ssb_t* ssb, void (*callback)(const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data), void* user_data);
+void tf_ssb_visit_broadcasts(tf_ssb_t* ssb,
+	void (*callback)(const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data),
+	void* user_data);
 
 /**
 ** Get the identities of all active connections.
diff --git a/src/ssb.import.c b/src/ssb.import.c
index 8be109fd..8d93012c 100644
--- a/src/ssb.import.c
+++ b/src/ssb.import.c
@@ -231,7 +231,11 @@ static void _tf_ssb_import_app_json(tf_ssb_t* ssb, uv_loop_t* loop, JSContext* c
 
 void tf_ssb_import(tf_ssb_t* ssb, const char* user, const char* path)
 {
-	if (strlen(path) > strlen(".json") && strcasecmp(path + strlen(path) - strlen(".json"), ".json") == 0)
+	if (!path)
+	{
+		return;
+	}
+	else if (strlen(path) > strlen(".json") && strcasecmp(path + strlen(path) - strlen(".json"), ".json") == 0)
 	{
 		_tf_ssb_import_app_json(ssb, tf_ssb_get_loop(ssb), tf_ssb_get_context(ssb), user, path);
 	}
diff --git a/src/ssb.js.c b/src/ssb.js.c
index 29220eae..fd2d49d8 100644
--- a/src/ssb.js.c
+++ b/src/ssb.js.c
@@ -1450,7 +1450,8 @@ typedef struct _broadcasts_t
 	int length;
 } broadcasts_t;
 
-static void _tf_ssb_broadcasts_visit(const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
+static void _tf_ssb_broadcasts_visit(
+	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
 {
 	broadcasts_t* broadcasts = user_data;
 	JSValue entry = JS_NewObject(broadcasts->context);
diff --git a/src/ssb.tests.c b/src/ssb.tests.c
index 86c1a1db..2e7cf28b 100644
--- a/src/ssb.tests.c
+++ b/src/ssb.tests.c
@@ -747,7 +747,8 @@ static void _break_in_a_bit(tf_ssb_t* ssb, tf_ssb_connection_t* connection, cons
 	uv_timer_start(&data->timer, _close_callback, 3000, 0);
 }
 
-static void _ssb_test_room_broadcasts_visit(const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
+static void _ssb_test_room_broadcasts_visit(
+	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
 {
 	tf_ssb_t* ssb = user_data;
 	char id[k_id_base64_len] = { 0 };