diff --git a/src/lib_raddbg_markup/raddbg_markup.h b/src/lib_raddbg_markup/raddbg_markup.h
index 97112df0..84a4bf92 100644
--- a/src/lib_raddbg_markup/raddbg_markup.h
+++ b/src/lib_raddbg_markup/raddbg_markup.h
@@ -170,7 +170,7 @@ raddbg_decode_utf8(char *str, unsigned __int64 max)
     case 2:
     if(2 < max)
     {
-      char cont_byte = str[1];
+      unsigned char cont_byte = str[1];
       if(raddbg_utf8_class[cont_byte >> 3] == 0)
       {
         result.codepoint = (byte & 0x0000001f) << 6;
@@ -181,7 +181,7 @@ raddbg_decode_utf8(char *str, unsigned __int64 max)
     case 3:
     if(2 < max)
     {
-      char cont_byte[2] = {str[1], str[2]};
+      unsigned char cont_byte[2] = {str[1], str[2]};
       if(raddbg_utf8_class[cont_byte[0] >> 3] == 0 &&
          raddbg_utf8_class[cont_byte[1] >> 3] == 0)
       {
@@ -194,7 +194,7 @@ raddbg_decode_utf8(char *str, unsigned __int64 max)
     case 4:
     if(3 < max)
     {
-      char cont_byte[3] = {str[1], str[2], str[3]};
+      unsigned char cont_byte[3] = {str[1], str[2], str[3]};
       if(raddbg_utf8_class[cont_byte[0] >> 3] == 0 &&
          raddbg_utf8_class[cont_byte[1] >> 3] == 0 &&
          raddbg_utf8_class[cont_byte[2] >> 3] == 0)
@@ -431,6 +431,9 @@ raddbg_annotate_vaddr_range__impl(void *ptr, unsigned __int64 size, char *fmt, .
       va_list args;
       va_start(args, fmt);
       buffer_size = RADDBG_MARKUP_VSNPRINTF(buffer, sizeof(buffer), fmt, args);
+      buffer_size = ((buffer_size < 0) ? 0 :
+                     (buffer_size > sizeof(buffer)) ? sizeof(buffer) :
+                     buffer_size);
       va_end(args);
     }
     
diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c
index 32deec8f..8b8b951c 100644
--- a/src/raddbg/raddbg_core.c
+++ b/src/raddbg/raddbg_core.c
@@ -10028,7 +10028,14 @@ rd_init(CmdLine *cmdln)
         String8List passthrough_args_list = {0};
         for(String8Node *n = target_args.first->next; n != 0; n = n->next)
         {
-          str8_list_push(scratch.arena, &passthrough_args_list, n->string);
+          if(str8_find_needle(n->string, 0, str8_lit(" "), 0) < n->string.size)
+          {
+            str8_list_pushf(scratch.arena, &passthrough_args_list, "\"%S\"", escaped_from_raw_str8(scratch.arena, n->string));
+          }
+          else
+          {
+            str8_list_push(scratch.arena, &passthrough_args_list, n->string);
+          }
         }
         StringJoin join = {str8_lit(""), str8_lit(" "), str8_lit("")};
         arguments_string = str8_list_join(scratch.arena, &passthrough_args_list, &join);