diff --git a/DiabloUI/_temp_funcs.h b/DiabloUI/_temp_funcs.h
index a7c7a62a1..17e057d2b 100644
--- a/DiabloUI/_temp_funcs.h
+++ b/DiabloUI/_temp_funcs.h
@@ -76,7 +76,7 @@ void __cdecl Connect_cpp_init();
 BOOL __stdcall UiGetDataCallback(int game_type, int data_code, void *a3, int a4, int a5);
 BOOL __stdcall UiSoundCallback(int a1, int type, int a3);
 BOOL __stdcall UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, LPSTR lpBuffer, int cchBufferMax);
-BOOL __stdcall UiDrawDescCallback(int arg0, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8);
+BOOL __stdcall UiDrawDescCallback(int game_type, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8);
 BOOL __stdcall UiCategoryCallback(int a1, int a2, int a3, int a4, int a5, DWORD *a6, DWORD *a7);
 int __fastcall Connect_GetRankFromLevel(char *str);
 BOOL __fastcall Connect_DiffFromString(char *str, _gamedata *gamedata, int a3, int a4);
@@ -84,8 +84,8 @@ void __fastcall Connect_SetDiffString(_gamedata *gamedata, const char *str1, cha
 BOOL __fastcall Connect_GetHeroInfoConc(const char *a1, _uiheroinfo *pInfo);
 void __fastcall Connect_MakeDescString(_uiheroinfo *a1, char *name, size_t size);
 void __stdcall UiCreateGameCriteria(_uiheroinfo *pInfo, char *str);
-BOOL __stdcall UiCreatePlayerDescription(_uiheroinfo *info, int mode, char *desc);
-void __stdcall UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, int type);
+BOOL __stdcall UiCreatePlayerDescription(_uiheroinfo *info, DWORD mode, char *desc);
+void __stdcall UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, DWORD type);
 void __fastcall Connect_CopyPlrDescStrings(char *str1, int size1, char *str2, int size2);
 
 BOOL __stdcall UiCopyProtError(int *pdwResult);
@@ -283,7 +283,7 @@ void __fastcall local_SetDiabloCursor(HWND hWnd);
 
 void __cdecl j_MainMenu_cpp_init();
 void __cdecl MainMenu_cpp_init();
-BOOL __stdcall UiMainMenuDialog(char *name, int *pdwResult, void(__stdcall *fnSound)(char *file), int a4);
+BOOL __stdcall UiMainMenuDialog(char *name, int *pdwResult, void(__stdcall *fnSound)(char *file), int attractTimeOut);
 LRESULT __stdcall MainMenu_WndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
 void __fastcall MainMenu_KillAndFreeMenu(HWND hWnd);
 void __fastcall MainMenu_SetMenuTimer(HWND hWnd);
diff --git a/DiabloUI/connect.cpp b/DiabloUI/connect.cpp
index 1eb03e4ac..586002289 100644
--- a/DiabloUI/connect.cpp
+++ b/DiabloUI/connect.cpp
@@ -450,7 +450,7 @@ BOOL __stdcall UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, LPS
 }
 
 // ref: 0x10003710
-BOOL __stdcall UiDrawDescCallback(int arg0, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8)
+BOOL __stdcall UiDrawDescCallback(int game_type, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8)
 {
 	HDC *v8;                  // ebx
 	HDC v9;                   // esi
@@ -525,7 +525,7 @@ BOOL __stdcall UiDrawDescCallback(int arg0, COLORREF color, LPCSTR lpString, cha
 				GetCurrentPositionEx(v17, (LPPOINT)&a8a[7]);
 				SetTextAlign(v8[6], 0);
 				connect_color_text = 1;
-				UiDrawDescCallback(arg0, 2u, (LPCSTR)a8, a4, 0, 1u, 0, a8a);
+				UiDrawDescCallback(game_type, 2u, (LPCSTR)a8, a4, 0, 1u, 0, a8a);
 				connect_color_text = 0;
 				if (a7) {
 					SetTextAlign(v8[6], 1u);
@@ -599,7 +599,7 @@ BOOL __stdcall UiDrawDescCallback(int arg0, COLORREF color, LPCSTR lpString, cha
 			goto LABEL_45;
 		}
 		if (a5 & 8) {
-			v25          = (arg0 != 'BNET') - 1;
+			v25          = (game_type != 'BNET') - 1;
 			v25 = v25 & 0xFD;
 			v24          = v25 + 4;
 			goto LABEL_46;
@@ -847,7 +847,7 @@ void __stdcall UiCreateGameCriteria(_uiheroinfo *pInfo, char *str)
 }
 
 // ref: 0x10003FD6
-BOOL __stdcall UiCreatePlayerDescription(_uiheroinfo *info, int mode, char *desc)
+BOOL __stdcall UiCreatePlayerDescription(_uiheroinfo *info, DWORD mode, char *desc)
 {
 	connect_charname = (char *)mode;
 	Connect_MakeDescString(info, desc, 0x80u);
@@ -855,7 +855,7 @@ BOOL __stdcall UiCreatePlayerDescription(_uiheroinfo *info, int mode, char *desc
 }
 
 // ref: 0x10003FF7
-void __stdcall UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, int type)
+void __stdcall UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, DWORD type)
 {
 	connect_charname = (char *)type;
 	SStrCopy(connect_plrinfostr, infostr, 128);
diff --git a/DiabloUI/diabloui.h b/DiabloUI/diabloui.h
index 923a26398..4e93c7442 100644
--- a/DiabloUI/diabloui.h
+++ b/DiabloUI/diabloui.h
@@ -35,7 +35,7 @@ BOOL __fastcall UiValidPlayerName(char *name); /* check __stdcall */
 BOOL __stdcall UiSelHeroMultDialog(BOOL(__stdcall *fninfo)(BOOL(__stdcall *fninfofunc)(_uiheroinfo *)), BOOL(__stdcall *fncreate)(_uiheroinfo *), BOOL(__stdcall *fnremove)(_uiheroinfo *), BOOL(__stdcall *fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, BOOL *hero_is_created, char *name);
 BOOL __stdcall UiSelHeroSingDialog(BOOL(__stdcall *fninfo)(BOOL(__stdcall *fninfofunc)(_uiheroinfo *)), BOOL(__stdcall *fncreate)(_uiheroinfo *), BOOL(__stdcall *fnremove)(_uiheroinfo *), BOOL(__stdcall *fnstats)(unsigned int, _uidefaultstats *), int *dlgresult, char *name, int *difficulty);
 BOOL __stdcall UiCreditsDialog(int a1);
-BOOL __stdcall UiMainMenuDialog(char *name, int *pdwResult, void(__stdcall *fnSound)(char *file), int a4);
+BOOL __stdcall UiMainMenuDialog(char *name, int *pdwResult, void(__stdcall *fnSound)(char *file), int attractTimeOut);
 BOOL __stdcall UiProgressDialog(HWND window, char *msg, int enable, int(*fnfunc)(), int rate);
 const char **__stdcall UiProfileGetString();
 void __cdecl UiProfileCallback();
@@ -45,13 +45,13 @@ BOOL __stdcall UiGetDataCallback(int game_type, int data_code, void *a3, int a4,
 BOOL __stdcall UiAuthCallback(int a1, char *a2, char *a3, char a4, char *a5, LPSTR lpBuffer, int cchBufferMax);
 BOOL __stdcall UiSoundCallback(int a1, int type, int a3);
 void __stdcall UiMessageBoxCallback(HWND hWnd, char *lpText, LPCSTR lpCaption, UINT uType);
-BOOL __stdcall UiDrawDescCallback(int arg0, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8);
+BOOL __stdcall UiDrawDescCallback(int game_type, COLORREF color, LPCSTR lpString, char *a4, int a5, UINT align, time_t a7, HDC *a8);
 BOOL __stdcall UiCreateGameCallback(int a1, int a2, int a3, int a4, int a5, int a6);
 BOOL __stdcall UiArtCallback(int game_type, unsigned int art_code, PALETTEENTRY *pPalette, BYTE *pBuffer, DWORD dwBuffersize, DWORD *pdwWidth, DWORD *pdwHeight, DWORD *pdwBpp);
 int __stdcall UiSelectGame(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *a6);
 int __stdcall UiSelectProvider(int a1, _SNETPROGRAMDATA *client_info, _SNETPLAYERDATA *user_info, _SNETUIDATA *ui_info, _SNETVERSIONDATA *file_info, int *type);
-BOOL __stdcall UiCreatePlayerDescription(_uiheroinfo *info, int mode, char *desc);
-void __stdcall UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, int type);
+BOOL __stdcall UiCreatePlayerDescription(_uiheroinfo *info, DWORD mode, char *desc);
+void __stdcall UiSetupPlayerInfo(char *infostr, _uiheroinfo *pInfo, DWORD type);
 void __stdcall UiCreateGameCriteria(_uiheroinfo *pInfo, char *str);
 BOOL __stdcall UiGetDefaultStats(int pclass, _uidefaultstats *pStats);
 BOOL __stdcall UiBetaDisclaimer(int a1);
diff --git a/DiabloUI/mainmenu.cpp b/DiabloUI/mainmenu.cpp
index fa3a2f45a..64d32021a 100644
--- a/DiabloUI/mainmenu.cpp
+++ b/DiabloUI/mainmenu.cpp
@@ -7,12 +7,12 @@ void __cdecl MainMenu_cpp_init()
 // 1002A0D4: using guessed type int mainmenu_cpp_float;
 
 // ref: 0x1000816F
-BOOL __stdcall UiMainMenuDialog(char *name, int *pdwResult, void(__stdcall *fnSound)(char *file), int a4)
+BOOL __stdcall UiMainMenuDialog(char *name, int *pdwResult, void(__stdcall *fnSound)(char *file), int attractTimeOut)
 {
 	int v4; // eax
 	int v5; // esi
 
-	menu_item_timer = a4;
+	menu_item_timer = attractTimeOut;
 	TitleSnd_SetSoundFunction(fnSound);
 	artfont_LoadAllFonts();
 	menu_version_str[0] = 0;
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index ad7d43b29..43aa04c56 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -216,7 +216,7 @@ void nthread_cleanup()
 		if (!sgbThreadIsRunning)
 			sgMemCrit.Leave();
 #endif
-		if (WaitForSingleObject(sghThread, 0xFFFFFFFF) == -1) {
+		if (WaitForSingleObject(sghThread, INFINITE) == -1) {
 			app_fatal("nthread3:\n(%s)", TraceLastError());
 		}
 		CloseHandle(sghThread);