diff --git a/src/coff/coff.c b/src/coff/coff.c
index d925ae56..a474f698 100644
--- a/src/coff/coff.c
+++ b/src/coff/coff.c
@@ -371,7 +371,7 @@ coff_make_import_header_by_ordinal(Arena             *arena,
   U8 *buffer      = push_array_no_zero(arena, U8, buffer_size);
   
   // copy header
-  MemoryCopyStruct(buffer, &header);
+  MemoryCopy(buffer, &header, sizeof(header));
   
   // no function name write zero
   U8 *func_name = buffer + sizeof(header);
diff --git a/src/pe/pe.c b/src/pe/pe.c
index 4cf32c11..417fdc1c 100644
--- a/src/pe/pe.c
+++ b/src/pe/pe.c
@@ -1302,7 +1302,7 @@ pe_exports_from_data(Arena *arena, U64 section_count, COFF_SectionHeader *sectio
         {
           B32 is_forwarder = dir_virt_range.min <= export_voff && export_voff < dir_virt_range.max;
           if (is_forwarder) {
-            U64 fwd_name_off = coff_foff_from_voff(sections, section_count, name_voff);
+            U64 fwd_name_off = coff_foff_from_voff(sections, section_count, export_voff);
             str8_deserial_read_cstr(raw_data, fwd_name_off, &forwarder);
           }
         }