diff --git a/renderdoc/driver/gl/gl_hooks.cpp b/renderdoc/driver/gl/gl_hooks.cpp
index 676626535..369f924be 100644
--- a/renderdoc/driver/gl/gl_hooks.cpp
+++ b/renderdoc/driver/gl/gl_hooks.cpp
@@ -285,14 +285,26 @@ void GLHook::RegisterHooks()
 
   LibraryHooks::RegisterLibraryHook(libraryName, &GLHooked);
 
-#define RegisterFunc(func, name)      \
-  LibraryHooks::RegisterFunctionHook( \
-      libraryName,                    \
-      FunctionHook(STRINGIZE(name), (void **)&GL.func, (void *)&CONCAT(func, _renderdoc_hooked)));
+  // MSVC compiles this function to use a huge amount of stack by initialising all the FunctionHook
+  // locals all at once. So we instead explicitly re-use the same hook (since it's going to be
+  // copied anyway, these are temporaries).
+  FunctionHook tmphook;
 
-#define RegisterUnsupportedFunc(name) \
-  LibraryHooks::RegisterFunctionHook( \
-      libraryName, FunctionHook(STRINGIZE(name), NULL, (void *)&CONCAT(name, _renderdoc_hooked)));
+#define RegisterFunc(func, name)                              \
+  {                                                           \
+    tmphook.function = STRINGIZE(name);                       \
+    tmphook.orig = (void **)&GL.func;                         \
+    tmphook.hook = (void *)&CONCAT(func, _renderdoc_hooked);  \
+    LibraryHooks::RegisterFunctionHook(libraryName, tmphook); \
+  }
+
+#define RegisterUnsupportedFunc(name)                         \
+  {                                                           \
+    tmphook.function = STRINGIZE(name);                       \
+    tmphook.orig = NULL;                                      \
+    tmphook.hook = (void *)&CONCAT(name, _renderdoc_hooked);  \
+    LibraryHooks::RegisterFunctionHook(libraryName, tmphook); \
+  }
 
   ForEachSupported(RegisterFunc);
   ForEachUnsupported(RegisterUnsupportedFunc);
diff --git a/renderdoc/os/win32/win32_process.cpp b/renderdoc/os/win32/win32_process.cpp
index dff7de0ba..d19933a62 100644
--- a/renderdoc/os/win32/win32_process.cpp
+++ b/renderdoc/os/win32/win32_process.cpp
@@ -270,8 +270,8 @@ void InjectDLL(HANDLE hProcess, rdcwstr libName)
     if(success)
     {
       HANDLE hThread = CreateRemoteThread(
-          hProcess, NULL, 0, (LPTHREAD_START_ROUTINE)GetProcAddress(kernel32, "LoadLibraryW"),
-          remoteMem, 0, NULL);
+          hProcess, NULL, 1024 * 1024U,
+          (LPTHREAD_START_ROUTINE)GetProcAddress(kernel32, "LoadLibraryW"), remoteMem, 0, NULL);
       if(hThread)
       {
         WaitForSingleObject(hThread, INFINITE);