diff --git a/mongoose.c b/mongoose.c
index 986eeb3c..ad8ecd0b 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -2390,7 +2390,7 @@ char *mg_straddr(struct mg_connection *c, char *buf, size_t len) {
 char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len) {
   if (addr->is_ip6) {
     uint16_t *p = (uint16_t *) addr->ip6;
-    snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", mg_htons(p[0]),
+    snprintf(buf, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", mg_htons(p[0]),
              mg_htons(p[1]), mg_htons(p[2]), mg_htons(p[3]), mg_htons(p[4]),
              mg_htons(p[5]), mg_htons(p[6]), mg_htons(p[7]));
   } else {
@@ -2988,6 +2988,7 @@ static void iolog(struct mg_connection *c, char *buf, long n, bool r) {
                     mg_addr_to_str(&a, t1, sizeof(t1)), r ? "<-" : "->",
                     mg_addr_to_str(&c->peer, t2, sizeof(t2)), c->label, n, s));
       free(s);
+      (void) t1, (void) t2;  // Silence warnings for MG_ENABLE_LOG=0
     }
     if (r) {
       struct mg_str evd = mg_str_n(buf, (size_t) n);
diff --git a/mongoose.h b/mongoose.h
index a25b3d7d..3343d7ff 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -861,6 +861,7 @@ bool mg_send(struct mg_connection *, const void *, size_t);
 int mg_printf(struct mg_connection *, const char *fmt, ...);
 int mg_vprintf(struct mg_connection *, const char *fmt, va_list ap);
 char *mg_straddr(struct mg_connection *, char *, size_t);
+char *mg_addr_to_str(struct mg_addr *, char *, size_t);
 bool mg_aton(struct mg_str str, struct mg_addr *addr);
 char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len);
 
diff --git a/src/net.c b/src/net.c
index a01e1fb3..b3b7cf77 100644
--- a/src/net.c
+++ b/src/net.c
@@ -34,7 +34,7 @@ char *mg_straddr(struct mg_connection *c, char *buf, size_t len) {
 char *mg_ntoa(const struct mg_addr *addr, char *buf, size_t len) {
   if (addr->is_ip6) {
     uint16_t *p = (uint16_t *) addr->ip6;
-    snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x", mg_htons(p[0]),
+    snprintf(buf, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx", mg_htons(p[0]),
              mg_htons(p[1]), mg_htons(p[2]), mg_htons(p[3]), mg_htons(p[4]),
              mg_htons(p[5]), mg_htons(p[6]), mg_htons(p[7]));
   } else {
diff --git a/src/sock.c b/src/sock.c
index 0b5ac6df..b0dc13cf 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -125,6 +125,7 @@ static void iolog(struct mg_connection *c, char *buf, long n, bool r) {
                     mg_addr_to_str(&a, t1, sizeof(t1)), r ? "<-" : "->",
                     mg_addr_to_str(&c->peer, t2, sizeof(t2)), c->label, n, s));
       free(s);
+      (void) t1, (void) t2;  // Silence warnings for MG_ENABLE_LOG=0
     }
     if (r) {
       struct mg_str evd = mg_str_n(buf, (size_t) n);
diff --git a/test/unit_test.c b/test/unit_test.c
index 4b84301c..d98d3e00 100644
--- a/test/unit_test.c
+++ b/test/unit_test.c
@@ -1514,7 +1514,6 @@ static void test_udp(void) {
   ASSERT(done == 111);
   mg_mgr_free(&mgr);
   ASSERT(mgr.conns == NULL);
-  exit(0);
 }
 
 static void test_check_ip_acl(void) {