diff --git a/4J.Storage/4J_Storage.cpp b/4J.Storage/4J_Storage.cpp
index 9db14bde5..13524a91d 100644
--- a/4J.Storage/4J_Storage.cpp
+++ b/4J.Storage/4J_Storage.cpp
@@ -13,10 +13,11 @@ C4JStorage::C4JStorage() : m_pStringTable(nullptr) {}
 void C4JStorage::Tick(void) {}
 
 C4JStorage::EMessageResult C4JStorage::RequestMessageBox(
-    UINT uiTitle, UINT uiText, UINT* uiOptionA, UINT uiOptionC, DWORD dwPad,
+    unsigned int uiTitle, unsigned int uiText, unsigned int* uiOptionA,
+    unsigned int uiOptionC, unsigned int dwPad,
     int (*Func)(void*, int, const C4JStorage::EMessageResult), void* lpParam,
     C4JStringTable* pStringTable, WCHAR* pwchFormatString,
-    DWORD dwFocusButton) {
+    unsigned int dwFocusButton) {
     return EMessage_ResultAccept;
 }
 
@@ -96,12 +97,13 @@ C4JStorage::ESaveGameState C4JStorage::LoadSaveDataThumbnail(
     void* lpParam) {
     return ESaveGame_Idle;
 }
-void C4JStorage::GetSaveCacheFileInfo(DWORD dwFile,
+void C4JStorage::GetSaveCacheFileInfo(unsigned int dwFile,
                                       XCONTENT_DATA& xContentData) {
     memset(&xContentData, 0, sizeof(xContentData));
 }
-void C4JStorage::GetSaveCacheFileInfo(DWORD dwFile, PBYTE* ppbImageData,
-                                      DWORD* pdwImageBytes) {
+void C4JStorage::GetSaveCacheFileInfo(unsigned int dwFile,
+                                      std::uint8_t** ppbImageData,
+                                      unsigned int* pdwImageBytes) {
     if (ppbImageData) *ppbImageData = nullptr;
     if (pdwImageBytes) *pdwImageBytes = 0;
 }
diff --git a/4J.Storage/4J_Storage.h b/4J.Storage/4J_Storage.h
index a49968463..8bc90ceb7 100644
--- a/4J.Storage/4J_Storage.h
+++ b/4J.Storage/4J_Storage.h
@@ -199,11 +199,11 @@ public:
 
     // Messages
     C4JStorage::EMessageResult RequestMessageBox(
-        UINT uiTitle, UINT uiText, UINT* uiOptionA, UINT uiOptionC,
-        DWORD dwPad = XUSER_INDEX_ANY,
+        unsigned int uiTitle, unsigned int uiText, unsigned int* uiOptionA,
+        unsigned int uiOptionC, unsigned int dwPad = XUSER_INDEX_ANY,
         int (*Func)(void*, int, const C4JStorage::EMessageResult) = NULL,
         void* lpParam = NULL, C4JStringTable* pStringTable = NULL,
-        WCHAR* pwchFormatString = NULL, DWORD dwFocusButton = 0);
+        WCHAR* pwchFormatString = NULL, unsigned int dwFocusButton = 0);
 
     C4JStorage::EMessageResult GetMessageBoxResult();
 
@@ -264,9 +264,10 @@ public:
         void* lpParam);  // Get the thumbnail for an individual save referenced
                          // by pSaveInfo
 
-    void GetSaveCacheFileInfo(DWORD dwFile, XCONTENT_DATA& xContentData);
-    void GetSaveCacheFileInfo(DWORD dwFile, PBYTE* ppbImageData,
-                              DWORD* pdwImageBytes);
+    void GetSaveCacheFileInfo(unsigned int dwFile, XCONTENT_DATA& xContentData);
+    void GetSaveCacheFileInfo(unsigned int dwFile,
+                              std::uint8_t** ppbImageData,
+                              unsigned int* pdwImageBytes);
 
     // Load the save. Need to call GetSaveData once the callback is called
     C4JStorage::ESaveGameState LoadSaveData(PSAVE_INFO pSaveInfo,
diff --git a/Minecraft.Client/Platform/Extrax64Stubs.cpp b/Minecraft.Client/Platform/Extrax64Stubs.cpp
index 5f7b78667..18bfb1415 100644
--- a/Minecraft.Client/Platform/Extrax64Stubs.cpp
+++ b/Minecraft.Client/Platform/Extrax64Stubs.cpp
@@ -558,7 +558,7 @@ void				C_4JProfile::ShowProfileCard(int iPad, PlayerUID targetUid) {}
 #if defined(__linux__)
 C4JStorage::C4JStorage() {}
 void								C4JStorage::Tick() {}
-C4JStorage::EMessageResult			C4JStorage::RequestMessageBox(UINT uiTitle, UINT uiText, UINT *uiOptionA,UINT uiOptionC, DWORD dwPad, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, C4JStringTable *pStringTable, WCHAR *pwchFormatString,DWORD dwFocusButton) { return C4JStorage::EMessage_Undefined; }
+C4JStorage::EMessageResult			C4JStorage::RequestMessageBox(unsigned int uiTitle, unsigned int uiText, unsigned int *uiOptionA,unsigned int uiOptionC, unsigned int dwPad, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult),LPVOID lpParam, C4JStringTable *pStringTable, WCHAR *pwchFormatString,unsigned int dwFocusButton) { return C4JStorage::EMessage_Undefined; }
 C4JStorage::EMessageResult			C4JStorage::GetMessageBoxResult()  { return C4JStorage::EMessage_Undefined; }
 bool								C4JStorage::SetSaveDevice(int( *Func)(LPVOID,const bool),LPVOID lpParam, bool bForceResetOfSaveDevice) { return true; }
 void								C4JStorage::Init(LPCWSTR pwchDefaultSaveName,char *pszSavePackName,int iMinimumSaveSize, int( *Func)(LPVOID, const ESavingMessage, int),LPVOID lpParam) {}
@@ -585,8 +585,8 @@ void								C4JStorage::SetSaveMessageVPosition(float fY) {}
 //C4JStorage::ESGIStatus				C4JStorage::GetSavesInfo(int iPad,bool ( *Func)(LPVOID, int, CACHEINFOSTRUCT *, int, HRESULT),LPVOID lpParam,char *pszSavePackName) { return C4JStorage::ESGIStatus_Idle; }
 C4JStorage::ESaveGameState			C4JStorage::GetSavesInfo(int iPad,int ( *Func)(LPVOID lpParam,SAVE_DETAILS *pSaveDetails,const bool),LPVOID lpParam,char *pszSavePackName) { return C4JStorage::ESaveGame_Idle; }
 
-void								C4JStorage::GetSaveCacheFileInfo(DWORD dwFile,XCONTENT_DATA &xContentData) {}
-void								C4JStorage::GetSaveCacheFileInfo(DWORD dwFile,	PBYTE *ppbImageData, DWORD *pdwImageBytes) {}
+void								C4JStorage::GetSaveCacheFileInfo(unsigned int dwFile,XCONTENT_DATA &xContentData) {}
+void								C4JStorage::GetSaveCacheFileInfo(unsigned int dwFile,	std::uint8_t * *ppbImageData, unsigned int *pdwImageBytes) {}
 C4JStorage::ESaveGameState			C4JStorage::LoadSaveData(PSAVE_INFO pSaveInfo,int( *Func)(LPVOID lpParam,const bool, const bool), LPVOID lpParam) {return C4JStorage::ESaveGame_Idle;}
 C4JStorage::EDeleteGameStatus		C4JStorage::DeleteSaveData(PSAVE_INFO pSaveInfo,int( *Func)(LPVOID lpParam,const bool), LPVOID lpParam) { return C4JStorage::EDeleteGame_Idle; }
 PSAVE_DETAILS						C4JStorage::ReturnSavesInfo() {return NULL;}