diff --git a/Minecraft.Client/Platform/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Platform/Common/Network/Sony/PlatformNetworkManagerSony.cpp
index 27ef1cf7e..abb1116fb 100644
--- a/Minecraft.Client/Platform/Common/Network/Sony/PlatformNetworkManagerSony.cpp
+++ b/Minecraft.Client/Platform/Common/Network/Sony/PlatformNetworkManagerSony.cpp
@@ -712,7 +712,7 @@ bool CPlatformNetworkManagerSony::LeaveGame(bool bMigrateHost)
 		if( socket != NULL )
 		{
 			//printf("Waiting for socket closed event\n");
-			DWORD result = socket->m_socketClosedEvent->WaitForSignal(INFINITE);
+			socket->m_socketClosedEvent->WaitForSignal(INFINITE);
 
 			// The session might be gone once the socket releases
 			if( IsInSession() )
@@ -1185,9 +1185,9 @@ bool CPlatformNetworkManagerSony::GetGameSessionInfo(int iPad, SessionID session
 	if( m_currentSearchResultsCount[iPad] > 0 )
 	{
 		// Loop through all the results.
-		for( DWORD dwResult = 0; dwResult < m_currentSearchResultsCount[iPad]; dwResult++ )
+		for( int resultIndex = 0; resultIndex < m_currentSearchResultsCount[iPad]; ++resultIndex )
 		{
-			pSearchResult = &m_pCurrentSearchResults[iPad]->pResults[dwResult];
+			pSearchResult = &m_pCurrentSearchResults[iPad]->pResults[resultIndex];
 
 			if(memcmp( &pSearchResult->info.sessionID, &sessionId, sizeof(SessionID) ) != 0) continue;
 
@@ -1211,7 +1211,7 @@ bool CPlatformNetworkManagerSony::GetGameSessionInfo(int iPad, SessionID session
 			if(!foundSession) break;
 
 			// See if this result was contacted successfully via QoS probes.
-			pxnqi = &m_pCurrentQoSResult[iPad]->axnqosinfo[dwResult];
+			pxnqi = &m_pCurrentQoSResult[iPad]->axnqosinfo[resultIndex];
 			if( pxnqi->bFlags & XNET_XNQOSINFO_TARGET_CONTACTED )
 			{
 
diff --git a/Minecraft.World/Platform/System.h b/Minecraft.World/Platform/System.h
index 5fc24dd51..b42b94682 100644
--- a/Minecraft.World/Platform/System.h
+++ b/Minecraft.World/Platform/System.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 
 #include "../Util/ArrayWithLength.h"
 
@@ -35,5 +36,5 @@ public:
 };
 
 #define MAKE_FOURCC(ch0, ch1, ch2, ch3)                              \
-	((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) |       \
-	((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
+	(static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch0)) | (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch1)) << 8) |       \
+	(static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch2)) << 16) | (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch3)) << 24))