diff --git a/std/event/fs.zig b/std/event/fs.zig
index a9be6a3ba98876b840b4d8116bec6ccca3553da8..30b897ad6e000a7e311b0b4e619e6af9dfa9117d 100644
--- a/std/event/fs.zig
+++ b/std/event/fs.zig
@@ -1056,6 +1056,7 @@ pub fn Watch(comptime V: type) type {
                     .table_lock = event.Lock.init(self.channel.loop),
                     .putter = undefined,
                 };
+                gop.kv.value = dir;
                 assert((try dir.file_table.put(basename_utf16le_no_null, value_copy)) == null);
                 basename_utf16le_null_consumed = true;
 
diff --git a/std/os/windows/kernel32.zig b/std/os/windows/kernel32.zig
index b8834d04a4dc984c62c84006484bd572bc05c2e8..7ad3ceebc255bfc50937a09a0bdfe1aae98d2200 100644
--- a/std/os/windows/kernel32.zig
+++ b/std/os/windows/kernel32.zig
@@ -117,7 +117,6 @@ pub extern "kernel32" stdcallcc fn HeapCreate(flOptions: DWORD, dwInitialSize: S
 pub extern "kernel32" stdcallcc fn HeapDestroy(hHeap: HANDLE) BOOL;
 pub extern "kernel32" stdcallcc fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: *c_void, dwBytes: SIZE_T) ?*c_void;
 pub extern "kernel32" stdcallcc fn HeapSize(hHeap: HANDLE, dwFlags: DWORD, lpMem: *const c_void) SIZE_T;
-pub extern "kernel32" stdcallcc fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: *const c_void) BOOL;
 pub extern "kernel32" stdcallcc fn HeapCompact(hHeap: HANDLE, dwFlags: DWORD) SIZE_T;
 pub extern "kernel32" stdcallcc fn HeapSummary(hHeap: HANDLE, dwFlags: DWORD, lpSummary: LPHEAP_SUMMARY) BOOL;
 
@@ -127,6 +126,8 @@ pub extern "kernel32" stdcallcc fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBy
 
 pub extern "kernel32" stdcallcc fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: *c_void) BOOL;
 
+pub extern "kernel32" stdcallcc fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: ?*const c_void) BOOL;
+
 pub extern "kernel32" stdcallcc fn MoveFileExA(
     lpExistingFileName: LPCSTR,
     lpNewFileName: LPCSTR,