diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp
index 0c212dae6..4e773911d 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.cpp
@@ -329,7 +329,7 @@ void UIScene_JoinMenu::handleFocusChange(F64 controlId, F64 childId)
 }
 
 #ifdef _DURANGO
-void UIScene_JoinMenu::checkPrivilegeCallback(LPVOID lpParam, bool hasPrivilege, int iPad)
+void UIScene_JoinMenu::checkPrivilegeCallback(void *lpParam, bool hasPrivilege, int iPad)
 {
 	UIScene_JoinMenu* pClass = (UIScene_JoinMenu*)lpParam;
 
@@ -389,7 +389,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 {
 	DWORD dwSignedInUsers = 0;
 	bool noPrivileges = false;
-	DWORD dwLocalUsersMask = 0;
+	int localUsersMask = 0;
 	bool isSignedInLive = true;
 	int iPadNotSignedInLive = -1;
 
@@ -409,7 +409,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 				}
 
 				if( !ProfileManager.AllowedToPlayMultiplayer(index) ) noPrivileges = true;
-				dwLocalUsersMask |= CGameNetworkManager::GetLocalPlayerMask(index);
+				localUsersMask |= CGameNetworkManager::GetLocalPlayerMask(index);
 				isSignedInLive = isSignedInLive && ProfileManager.IsSignedInLive(index);
 			}
 		}
@@ -419,7 +419,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 		if(ProfileManager.IsSignedIn(ProfileManager.GetPrimaryPad()))
 		{
 			if( !ProfileManager.AllowedToPlayMultiplayer(ProfileManager.GetPrimaryPad()) ) noPrivileges = true;
-			dwLocalUsersMask |= CGameNetworkManager::GetLocalPlayerMask(ProfileManager.GetPrimaryPad());
+			localUsersMask |= CGameNetworkManager::GetLocalPlayerMask(ProfileManager.GetPrimaryPad());
 
 			isSignedInLive = ProfileManager.IsSignedInLive(ProfileManager.GetPrimaryPad());
 #ifdef __PSVITA__
@@ -507,7 +507,7 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
 			ProfileManager.DisplaySystemMessage( SCE_MSG_DIALOG_SYSMSG_TYPE_TRC_PSN_CHAT_RESTRICTION, ProfileManager.GetPrimaryPad() );
 		}
 #endif
-		CGameNetworkManager::eJoinGameResult result = g_NetworkManager.JoinGame( pClass->m_selectedSession, dwLocalUsersMask );
+		CGameNetworkManager::eJoinGameResult result = g_NetworkManager.JoinGame( pClass->m_selectedSession, localUsersMask );
 
 		// Alert the app the we no longer want to be informed of ethernet connections
 		app.SetLiveLinkRequired( false );
@@ -583,4 +583,4 @@ void UIScene_JoinMenu::handleTimerComplete(int id)
 		}
 		break;
 	};
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h
index a97ee5a3e..056415e11 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_JoinMenu.h
@@ -90,7 +90,7 @@ protected:
 	void StartSharedLaunchFlow();
 
 #ifdef _DURANGO
-	static void checkPrivilegeCallback(LPVOID lpParam, bool hasPrivilege, int iPad);
+	static void checkPrivilegeCallback(void *lpParam, bool hasPrivilege, int iPad);
 #endif
 	
 	static int StartGame_SignInReturned(void *pParam, bool, int);
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
index 66ad44b42..79dc6428a 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -51,7 +51,7 @@ C4JStorage::SAVETRANSFER_FILE_DETAILS UIScene_LoadOrJoinMenu::m_debugTransferDet
 #endif
 #endif
 
-int UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
+int UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(void *lpParam, std::uint8_t *pbThumbnail, DWORD dwThumbnailBytes)
 {
     UIScene_LoadOrJoinMenu *pClass= (UIScene_LoadOrJoinMenu *)lpParam;
 
@@ -74,7 +74,7 @@ int UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE p
     return 0;
 }
 
-int UIScene_LoadOrJoinMenu::LoadSaveCallback(LPVOID lpParam,bool bRes)
+int UIScene_LoadOrJoinMenu::LoadSaveCallback(void *lpParam,bool bRes)
 {
     //UIScene_LoadOrJoinMenu *pClass= (UIScene_LoadOrJoinMenu *)lpParam;
     // Get the save data now
@@ -1165,7 +1165,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
     }
 }
 
-int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,bool bRes)
+int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(void *lpParam,bool bRes)
 {
     // 4J HEG - No reason to set value if keyboard was cancelled
     UIScene_LoadOrJoinMenu *pClass=(UIScene_LoadOrJoinMenu *)lpParam;
@@ -1224,7 +1224,7 @@ void UIScene_LoadOrJoinMenu::handleFocusChange(F64 controlId, F64 childId)
 
 
 #ifdef SONY_REMOTE_STORAGE_DOWNLOAD
-void UIScene_LoadOrJoinMenu::remoteStorageGetSaveCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code)
+void UIScene_LoadOrJoinMenu::remoteStorageGetSaveCallback(void *lpParam, SonyRemoteStorage::Status s, int error_code)
 {
     app.DebugPrintf("remoteStorageGetCallback err : 0x%08x\n", error_code);
     assert(error_code == 0);
@@ -1590,7 +1590,7 @@ void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
     ui.NavigateToScene(ProfileManager.GetPrimaryPad(),eUIScene_FullscreenProgress, loadingParams);
 }
 
-void UIScene_LoadOrJoinMenu::UpdateGamesListCallback(LPVOID pParam)
+void UIScene_LoadOrJoinMenu::UpdateGamesListCallback(void *pParam)
 {
     if(pParam != NULL)
     {
@@ -2041,7 +2041,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
     return 0;
 }
 
-int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
+int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(void *lpParam,bool bRes)
 {
 	ui.EnterCallbackIdCriticalSection();
     UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)ui.GetSceneFromCallbackId((size_t)lpParam);
@@ -2062,7 +2062,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
 }
 
 
-int UIScene_LoadOrJoinMenu::RenameSaveDataReturned(LPVOID lpParam,bool bRes)
+int UIScene_LoadOrJoinMenu::RenameSaveDataReturned(void *lpParam,bool bRes)
 {
     UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)lpParam;
 
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h
index 02f850978..c0511d5dc 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.h
@@ -124,7 +124,7 @@ public:
 
 	virtual EUIScene getSceneType() { return eUIScene_LoadOrJoinMenu;}
 
-	static void UpdateGamesListCallback(LPVOID pParam);
+	static void UpdateGamesListCallback(void *pParam);
 #ifdef _XBOX_ONE
 	void HandleDLCLicenseChange();
 #endif
@@ -145,14 +145,14 @@ protected:
 
 public:
 
-	static int LoadSaveDataThumbnailReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes);
-	static int LoadSaveCallback(LPVOID lpParam,bool bRes);
+	static int LoadSaveDataThumbnailReturned(void *lpParam, std::uint8_t *pbThumbnail, DWORD dwThumbnailBytes);
+	static int LoadSaveCallback(void *lpParam,bool bRes);
 	static int DeleteSaveDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);
 	static int SaveOptionsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);
 	static int TexturePackDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result);	
-	static int DeleteSaveDataReturned(LPVOID lpParam,bool bRes);
-	static int RenameSaveDataReturned(LPVOID lpParam,bool bRes);
-	static int KeyboardCompleteWorldNameCallback(LPVOID lpParam,bool bRes);
+	static int DeleteSaveDataReturned(void *lpParam,bool bRes);
+	static int RenameSaveDataReturned(void *lpParam,bool bRes);
+	static int KeyboardCompleteWorldNameCallback(void *lpParam,bool bRes);
 protected:
 	void handlePress(F64 controlId, F64 childId);
 	void LoadLevelGen(LevelGenerationOptions *levelGen);
@@ -172,7 +172,7 @@ private:
 #if defined(__PS3__) || defined(__PSVITA__) || defined(__ORBIS__)
 	static int MustSignInReturnedPSN(void *pParam,int iPad,C4JStorage::EMessageResult result);
 	static int PSN_SignInReturned(void *pParam,bool bContinue, int iPad);
-	static void remoteStorageGetSaveCallback(LPVOID lpParam, SonyRemoteStorage::Status s, int error_code);
+	static void remoteStorageGetSaveCallback(void *lpParam, SonyRemoteStorage::Status s, int error_code);
 #endif
  
 #ifdef __ORBIS__