diff --git a/src/dwarf/dwarf_parse.c b/src/dwarf/dwarf_parse.c
index 6e0c5849..ded1b326 100644
--- a/src/dwarf/dwarf_parse.c
+++ b/src/dwarf/dwarf_parse.c
@@ -2216,15 +2216,17 @@ dw_read_line_vm_header(Arena           *arena,
 {
   Temp scratch = scratch_begin(&arena, 1);
 
+  U64 cursor = 0;
+
   U32 first_four_bytes = 0;
   if (str8_deserial_read_struct(cu_stmt_list, 0, &first_four_bytes) != sizeof(U32)) { goto exit; }
 
   // read unit length
   U64 length      = 0;
   U64 length_size = str8_deserial_read_dwarf_packed_size(cu_stmt_list, 0, &length);
-  
   DW_Format format = first_four_bytes == max_U32 ? DW_Format_64Bit : DW_Format_32Bit;
-  U64       cursor = length_size;
+  
+  cursor = length_size;
   String8   data   = str8_substr(cu_stmt_list, r1u64(0, length + length_size));
   
   // read unit version
diff --git a/src/linker/lnk.c b/src/linker/lnk.c
index 812ecfcb..2732944c 100644
--- a/src/linker/lnk.c
+++ b/src/linker/lnk.c
@@ -4335,7 +4335,7 @@ lnk_build_image(TP_Arena *arena, TP_Context *tp, LNK_Config *config, LNK_SymbolT
 
         // compute .bss virtual size - this marks start of the common block
         lnk_finalize_section_layout(common_block_sect, config->file_align, config->function_pad_min);
-        U64 common_block_cursor = common_block_sect->vsize;
+        U32 common_block_cursor = common_block_sect->vsize;
 
         // compute and assign offsets into the common block
         for EachIndex(contrib_idx, common_block_contribs_count) {
diff --git a/src/linker/pdb_ext/msf_builder.c b/src/linker/pdb_ext/msf_builder.c
index 40a879d5..bf5f9441 100644
--- a/src/linker/pdb_ext/msf_builder.c
+++ b/src/linker/pdb_ext/msf_builder.c
@@ -1155,9 +1155,9 @@ msf_stream_write_parallel(TP_Context *tp, MSF_Context *msf, MSF_StreamNumber sn,
   if (is_write_ok) {
     U64 expected_pos = stream->pos + buffer_size;
 
-    U64 pre_size = Min(AlignPadPow2(stream->pos, msf->page_size), buffer_size);
-    U64 mid_size = AlignDownPow2(buffer_size - pre_size, msf->page_size);
-    U64 end_size = buffer_size - (pre_size + mid_size);
+    MSF_UInt pre_size = Min(AlignPadPow2(stream->pos, msf->page_size), buffer_size);
+    MSF_UInt mid_size = AlignDownPow2(buffer_size - pre_size, msf->page_size);
+    MSF_UInt end_size = buffer_size - (pre_size + mid_size);
 
     U8 *pre_ptr = (U8*)buffer;
     U8 *mid_ptr = (U8*)buffer + pre_size;