diff --git a/labels/debug.asm b/labels/debug.asm
index 177ceb4..de07565 100644
--- a/labels/debug.asm
+++ b/labels/debug.asm
@@ -418,7 +418,7 @@ dbg_startup_infos:
     CLB
     lea r9, [rel log_buffer]
     AAPPEND r9, str_config_servername
-    AAPPEND r9, server_w_ver
+    AAPPEND r9, server_name
     lea rcx, [rel log_buffer]
     sub r9, rcx
     mov rbx, r9
diff --git a/labels/initialsetup.asm b/labels/initialsetup.asm
index 5908d98..b1a604a 100644
--- a/labels/initialsetup.asm
+++ b/labels/initialsetup.asm
@@ -166,6 +166,7 @@ initial_setup:
     lea r14, [rel server_w_ver]
     AAPPEND r14, default_name
     AAPPEND r14, version
+    mov byte [r14], 0            ; null term
     ret  ; .build_server_name return point
 
 .open_logfile:
diff --git a/labels/loadenv.asm b/labels/loadenv.asm
index b6eb20d..34e4d87 100644
--- a/labels/loadenv.asm
+++ b/labels/loadenv.asm
@@ -151,7 +151,7 @@ load_config:
 
     ENV_DEFAULT env_path_buf, key_linger_to, max_age_str, 12, default_linger_to
     ATOI max_age_str, rax
-    mov dword [rel linger_to], eax
+    mov word [rel linger_to], ax
 
     ENV_DEFAULT env_path_buf, key_servedots, serve_dots_str, 5, default_servedots
     BOOL_FLAG serve_dots_str, serve_dots
diff --git a/program.asm b/program.asm
index a3fe5ee..5dd5233 100644
--- a/program.asm
+++ b/program.asm
@@ -816,13 +816,14 @@ _start:
     PARSE_REFERER_HEADER request, 8192, referer,    1024
 
     cmp byte [rel use_xri], 1
-    jne .str_req            ; check if we need to use the X-Real-IP header
+    jne .use_client_ip        ; check if we need to use the X-Real-IP header
 
     PARSE_XRI_HEADER request, 8192, real_ip, 39
-    
+
     cmp byte [rel real_ip], 0
-    jne .str_req
+    jne .str_req              ; header was present, keep it
 
+.use_client_ip:
     mov rsi, client_ip_str
     mov rdi, real_ip
     mov rcx, 16