diff --git a/src/LuaManager.cpp b/src/LuaManager.cpp
index 2c57145d0b..868d9dfdf5 100644
--- a/src/LuaManager.cpp
+++ b/src/LuaManager.cpp
@@ -84,6 +84,7 @@ namespace LuaHelpers
 	template<> void Push<double>( lua_State *L, const double &Object ) { lua_pushnumber( L, Object ); }
 	template<> void Push<int>( lua_State *L, const int &Object ) { lua_pushinteger( L, Object ); }
 	template<> void Push<unsigned int>( lua_State *L, const unsigned int &Object ) { lua_pushnumber( L, double(Object) ); }
+    template<> void Push<unsigned long long>( lua_State *L, const unsigned long long &Object ) { lua_pushnumber( L, double(Object) ); }
 	template<> void Push<RString>( lua_State *L, const RString &Object ) { lua_pushlstring( L, Object.data(), Object.size() ); }
 	template<> void Push<std::string>( lua_State *L, std::string const& object ) { lua_pushlstring( L, object.data(), object.size() ); }
 
diff --git a/src/arch/Dialog/DialogDriver_Win32.cpp b/src/arch/Dialog/DialogDriver_Win32.cpp
index 4a744b6b84..95995e5f65 100644
--- a/src/arch/Dialog/DialogDriver_Win32.cpp
+++ b/src/arch/Dialog/DialogDriver_Win32.cpp
@@ -29,7 +29,7 @@ static RString g_sMessage;
 static bool g_bAllowHush;
 
 #if !defined(SMPACKAGE)
-static BOOL CALLBACK OKWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
+static INT_PTR CALLBACK OKWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
 {
 	switch( msg )
 	{
@@ -139,7 +139,7 @@ Dialog::Result DialogDriver_Win32::OKCancel( RString sMessage, RString sID )
 #if !defined(SMPACKAGE)
 static RString g_sErrorString;
 
-static BOOL CALLBACK ErrorWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
+static INT_PTR CALLBACK ErrorWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
 {
 	switch( msg )
 	{
diff --git a/src/arch/LoadingWindow/LoadingWindow_Win32.cpp b/src/arch/LoadingWindow/LoadingWindow_Win32.cpp
index 76a739f61a..d6270af258 100644
--- a/src/arch/LoadingWindow/LoadingWindow_Win32.cpp
+++ b/src/arch/LoadingWindow/LoadingWindow_Win32.cpp
@@ -81,7 +81,7 @@ static HBITMAP LoadWin32Surface( RString sFile, HWND hWnd )
         return ret;
 }
 
-BOOL CALLBACK LoadingWindow_Win32::WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
+INT_PTR CALLBACK LoadingWindow_Win32::WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
 {
 	switch( msg )
 	{
diff --git a/src/arch/LoadingWindow/LoadingWindow_Win32.h b/src/arch/LoadingWindow/LoadingWindow_Win32.h
index bce72a4de4..e6593aa597 100644
--- a/src/arch/LoadingWindow/LoadingWindow_Win32.h
+++ b/src/arch/LoadingWindow/LoadingWindow_Win32.h
@@ -27,7 +27,7 @@ private:
 	RString text[3];
 	HICON m_hIcon;
 
-	static BOOL CALLBACK WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam );
+	static INT_PTR CALLBACK WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam );
 };
 #define USE_LOADING_WINDOW_WIN32
 
diff --git a/src/archutils/Win32/WindowsDialogBox.cpp b/src/archutils/Win32/WindowsDialogBox.cpp
index 40f6621769..755d034eaf 100644
--- a/src/archutils/Win32/WindowsDialogBox.cpp
+++ b/src/archutils/Win32/WindowsDialogBox.cpp
@@ -15,7 +15,7 @@ void WindowsDialogBox::Run( int iDialog )
 	DialogBoxParam( hHandle, MAKEINTRESOURCE(iDialog), nullptr, DlgProc, (LPARAM) this );
 }
 
-BOOL APIENTRY WindowsDialogBox::DlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam )
+INT_PTR APIENTRY WindowsDialogBox::DlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam )
 {
 	if( msg == WM_INITDIALOG )
 		SetProp( hDlg, "WindowsDialogBox", (HANDLE) lParam );
diff --git a/src/archutils/Win32/WindowsDialogBox.h b/src/archutils/Win32/WindowsDialogBox.h
index 4616928aab..d8cd860735 100644
--- a/src/archutils/Win32/WindowsDialogBox.h
+++ b/src/archutils/Win32/WindowsDialogBox.h
@@ -18,7 +18,7 @@ protected:
 	virtual BOOL HandleMessage( UINT msg, WPARAM wParam, LPARAM lParam ) { return false; }
 
 private:
-	static BOOL APIENTRY DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+	static INT_PTR APIENTRY DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 	HWND m_hWnd;
 };