diff --git a/meta/4ed_file_moving.h b/meta/4ed_file_moving.h
index c02c6ec7..e013f5ed 100644
--- a/meta/4ed_file_moving.h
+++ b/meta/4ed_file_moving.h
@@ -74,10 +74,10 @@ internal void fm_slash_fix(char *path);
 
 // Memory concat helpers
 internal char *fm_prepare_string_internal(char *s1, ...);
-#define fm_str(...) fm_prepare_string_internal(__VA_ARGS__, 0)
+#define fm_str(...) fm_prepare_string_internal(__VA_ARGS__, (void*)0)
 
 internal char **fm_prepare_list_internal(char **l1, ...);
-#define fm_list(...) fm_prepare_list_internal(__VA_ARGS__, 0)
+#define fm_list(...) fm_prepare_list_internal(__VA_ARGS__, (void*)0)
 
 internal char **fm_list_one_item(char *item);
 
diff --git a/platform_win32/win32_4ed.cpp b/platform_win32/win32_4ed.cpp
index 171d3b3b..a913d097 100644
--- a/platform_win32/win32_4ed.cpp
+++ b/platform_win32/win32_4ed.cpp
@@ -540,10 +540,10 @@ Win32Resize(i32 width, i32 height){
 
 #define GLFuncGood(f) (((f)!=0)&&((f)!=(void*)1)&&((f)!=(void*)2)&&((f)!=(void*)3)&&((f)!=(void*)-11))
 
-typedef HGLRC CALL_CONVENTION (wglCreateContextAttribsARB_Function)(HDC,HGLRC,i32*);
-typedef BOOL  CALL_CONVENTION (wglChoosePixelFormatARB_Function)(HDC,i32*,f32*,u32,i32*,u32*);
-typedef char* CALL_CONVENTION (wglGetExtensionsStringEXT_Function)();
-typedef VOID  CALL_CONVENTION (wglSwapIntervalEXT_Function)(i32);
+typedef HGLRC (CALL_CONVENTION wglCreateContextAttribsARB_Function)(HDC,HGLRC,i32*);
+typedef BOOL  (CALL_CONVENTION wglChoosePixelFormatARB_Function)(HDC,i32*,f32*,u32,i32*,u32*);
+typedef char* (CALL_CONVENTION wglGetExtensionsStringEXT_Function)();
+typedef VOID  (CALL_CONVENTION wglSwapIntervalEXT_Function)(i32);
 
 global wglCreateContextAttribsARB_Function *wglCreateContextAttribsARB = 0;
 global wglChoosePixelFormatARB_Function *wglChoosePixelFormatARB = 0;