diff --git a/build.bat b/build.bat
index 71b84126..33e7dbda 100644
--- a/build.bat
+++ b/build.bat
@@ -49,7 +49,7 @@ set cl_release=    call cl /O2 /DBUILD_DEBUG=0 %cl_common% %auto_compile_flags%
 set clang_debug=   call clang -g -O0 -DBUILD_DEBUG=1 %clang_common% %auto_compile_flags%
 set clang_release= call clang -g -O2 -DBUILD_DEBUG=0 %clang_common% %auto_compile_flags%
 set cl_link=       /link /MANIFEST:EMBED /INCREMENTAL:NO /pdbaltpath:%%%%_PDB%%%% /NATVIS:"%~dp0\src\natvis\base.natvis" /noexp
-set clang_link=    -fuse-ld=lld -Xlinker /MANIFEST:EMBED -Xlinker /pdbaltpath:%%%%_PDB%%%% -Xlinker /NATVIS:"%~dp0\src\natvis\base.natvis" -Xlinker /noexp
+set clang_link=    -fuse-ld=lld -Xlinker /MANIFEST:EMBED -Xlinker /pdbaltpath:%%%%_PDB%%%% -Xlinker /NATVIS:"%~dp0\src\natvis\base.natvis"
 set cl_out=        /out:
 set clang_out=     -o
 set cl_natvis=     /NATVIS:
diff --git a/src/base/base_core.c b/src/base/base_core.c
index 09f9f749..1e36a180 100644
--- a/src/base/base_core.c
+++ b/src/base/base_core.c
@@ -553,6 +553,7 @@ date_time_from_unix_time(U64 unix_time)
         case Month_Oct: c = 31; break;
         case Month_Nov: c = 30; break;
         case Month_Dec: c = 31; break;
+        default: InvalidPath;
       }
       if(date.day <= c)
       {
diff --git a/src/codeview/codeview.h b/src/codeview/codeview.h
index 760f042f..721c51da 100644
--- a/src/codeview/codeview.h
+++ b/src/codeview/codeview.h
@@ -2907,7 +2907,6 @@ struct CV_C13InlineeSourceLineHeader
 ////////////////////////////////
 //~ Type Index Helper
 
-typedef enum CV_TypeIndexSource CV_TypeIndexSource;
 enum CV_TypeIndexSource
 {
   CV_TypeIndexSource_NULL,
@@ -2915,6 +2914,7 @@ enum CV_TypeIndexSource
   CV_TypeIndexSource_IPI,
   CV_TypeIndexSource_COUNT
 };
+typedef enum CV_TypeIndexSource CV_TypeIndexSource;
 
 typedef struct CV_TypeIndexInfo CV_TypeIndexInfo;
 struct CV_TypeIndexInfo
diff --git a/src/linker/lnk.c b/src/linker/lnk.c
index 8e7b6d4c..f03204b3 100644
--- a/src/linker/lnk.c
+++ b/src/linker/lnk.c
@@ -4295,6 +4295,7 @@ lnk_string_from_input_source(LNK_InputSourceType input_source)
   case LNK_InputSource_CmdLine: result = str8_lit("CmdLine"); break;
   case LNK_InputSource_Default: result = str8_lit("Default"); break;
   case LNK_InputSource_Obj:     result = str8_lit("Obj");     break;
+  default:                      InvalidPath;
   }
   return result;
 }
diff --git a/src/msf/msf_parse.c b/src/msf/msf_parse.c
index 7cee54a3..79d00fd1 100644
--- a/src/msf/msf_parse.c
+++ b/src/msf/msf_parse.c
@@ -213,8 +213,6 @@ msf_raw_stream_table_from_data(Arena *arena, String8 msf_data)
         index_cursor += stream_page_count * index_size;
         stream_ptr   += 1;
       }
-      
-      parse_streams_done:;
     }
     
     if (got_streams) {
diff --git a/src/msvc_crt/msvc_crt.c b/src/msvc_crt/msvc_crt.c
index 5bb5d1f5..4927b3c4 100644
--- a/src/msvc_crt/msvc_crt.c
+++ b/src/msvc_crt/msvc_crt.c
@@ -373,7 +373,7 @@ mscrt_catch_blocks_from_data_x8664(Arena              *arena,
     U64            uwinfo_foff = coff_foff_from_voff(sections, section_count, pdata->voff_unwind_info);
     PE_UnwindInfo *uwinfo      = str8_deserial_get_raw_ptr(raw_data, uwinfo_foff, sizeof(*uwinfo));
 
-    U8  flags            = PE_UnwindInfo_FlagsFromHeader(uwinfo->header);
+    U8  flags            = PE_UNWIND_INFO_FLAGS_FROM_HDR(uwinfo->header);
     B32 is_chained       = !!(flags & PE_UnwindInfoFlag_CHAINED);
     B32 has_handler_data = !is_chained && ((flags & (PE_UnwindInfoFlag_EHANDLER | PE_UnwindInfoFlag_UHANDLER)) != 0);
 
diff --git a/src/pe/pe.c b/src/pe/pe.c
index d0c919de..3d826019 100644
--- a/src/pe/pe.c
+++ b/src/pe/pe.c
@@ -78,6 +78,7 @@ pe_string_from_unwind_gpr_x64(PE_UnwindGprRegX64 x)
     case PE_UnwindGprRegX64_R13: return str8_lit("R13");
     case PE_UnwindGprRegX64_R14: return str8_lit("R14");
     case PE_UnwindGprRegX64_R15: return str8_lit("R15");
+    default: InvalidPath;
   }
   return str8_zero();
 }
@@ -102,6 +103,7 @@ pe_string_from_data_directory_index(PE_DataDirectoryIndex x)
     case PE_DataDirectoryIndex_DELAY_IMPORT:   return str8_lit("DelayImport");
     case PE_DataDirectoryIndex_COM_DESCRIPTOR: return str8_lit("COM Descriptor");
     case PE_DataDirectoryIndex_RESERVED:       return str8_lit("Reserved");
+    default: InvalidPath;
   }
   return str8_zero();
 }
diff --git a/src/pe/pe.h b/src/pe/pe.h
index e102ea5c..18d5af3d 100644
--- a/src/pe/pe.h
+++ b/src/pe/pe.h
@@ -1022,7 +1022,7 @@ internal PE_WindowsSubsystem pe_subsystem_from_string(String8 string);
 
 internal String8 pe_string_from_subsystem(PE_WindowsSubsystem x);
 internal String8 pe_string_from_unwind_gpr_x64(PE_UnwindGprRegX64 x);
-internal String8 pe_string_from_data_directory_index(PE_DebugDirectoryType x);
+internal String8 pe_string_from_data_directory_index(PE_DataDirectoryIndex x);
 internal String8 pe_string_from_debug_directory_type(PE_DebugDirectoryType x);
 internal String8 pe_string_from_fpo_type(PE_FPOType x);
 internal String8 pe_string_from_misc_type(PE_DebugMiscType x);