diff --git a/package/gluon-radv-filterd/src/gluon-radv-filterd.c b/package/gluon-radv-filterd/src/gluon-radv-filterd.c
index ed090c46..b1620cae 100644
--- a/package/gluon-radv-filterd/src/gluon-radv-filterd.c
+++ b/package/gluon-radv-filterd/src/gluon-radv-filterd.c
@@ -559,14 +559,13 @@ static int parse_tt_local(struct nl_msg *msg,
 }
 
 static void update_tqs(void) {
+	static const struct ether_addr unspec = {};
 	struct router *router;
 	bool update_originators = false;
-	struct ether_addr unspec;
 	struct batadv_nlquery_opts opts;
 	int ret;
 
 	// reset TQs
-	memset(&unspec, 0, sizeof(unspec));
 	foreach(router, G.routers) {
 		router->tq = 0;
 		if (ether_addr_equal(router->originator, unspec))
@@ -609,12 +608,12 @@ static void update_tqs(void) {
 	foreach(router, G.routers) {
 		if (router->tq == 0) {
 			if (ether_addr_equal(router->originator, unspec))
-				fprintf(stderr,
-					"Unable to find router " F_MAC " in transtable_{global,local}\n",
+				DEBUG_MSG(
+					"Unable to find router " F_MAC " in transtable_{global,local}",
 					F_MAC_VAR(router->src));
 			else
-				fprintf(stderr,
-					"Unable to find TQ for originator " F_MAC " (router " F_MAC ")\n",
+				DEBUG_MSG(
+					"Unable to find TQ for originator " F_MAC " (router " F_MAC ")",
 					F_MAC_VAR(router->originator),
 					F_MAC_VAR(router->src));
 		}
diff --git a/package/gluon-radv-filterd/src/mac.h b/package/gluon-radv-filterd/src/mac.h
index cc24d907..eece1105 100644
--- a/package/gluon-radv-filterd/src/mac.h
+++ b/package/gluon-radv-filterd/src/mac.h
@@ -1,4 +1,7 @@
+#pragma once
+
 #include <stdint.h>
+#include <string.h>
 #include <linux/if_ether.h>
 
 #define F_MAC "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx"