diff --git a/redo/comctl32_windows.c b/redo/comctl32_windows.c
index d621d2a..a6ffaf1 100644
--- a/redo/comctl32_windows.c
+++ b/redo/comctl32_windows.c
@@ -39,7 +39,7 @@ DWORD initCommonControls(LPCWSTR manifest, char **errmsg)
 	}
 
 	/* GetProcAddress() only takes a multibyte string */
-#define LOAD(fn) f = GetModuleHandle(comctl32, fn); \
+#define LOAD(fn) f = GetProcAddress(comctl32, fn); \
 	if (f == NULL) { \
 		*errmsg = "error loading " fn "()"; \
 		return GetLastError(); \
diff --git a/redo/common_windows.c b/redo/common_windows.c
index 6b9bf8c..f12050c 100644
--- a/redo/common_windows.c
+++ b/redo/common_windows.c
@@ -7,7 +7,7 @@ LRESULT getWindowTextLen(HWND hwnd)
 	return SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0);
 }
 
-void getWindowText(HWND hwnd, WPARAM n, LPCWSTR out)
+void getWindowText(HWND hwnd, WPARAM n, LPCWSTR buf)
 {
 	SetLastError(0);
 	if (SendMessageW(hwnd, WM_GETTEXT, n + 1, (LPARAM) buf) != n)
diff --git a/redo/winapi_windows.h b/redo/winapi_windows.h
index 71eb94e..9d75af4 100644
--- a/redo/winapi_windows.h
+++ b/redo/winapi_windows.h
@@ -44,7 +44,7 @@ extern LRESULT forwardCommand(HWND, UINT, WPARAM, LPARAM);
 extern void setButtonSubclass(HWND, void *);
 
 /* init_windows.c */
-extern HINSTANCE hInstnace;
+extern HINSTANCE hInstance;
 extern int nCmdShow;
 extern HICON hDefaultIcon;
 extern HCURSOR hArrowCursor;