diff --git a/Minecraft.Client/Cross64/Cross64Extras/Cross64Stubs.h b/Minecraft.Client/Cross64/Cross64Extras/Cross64Stubs.h
index 2c6b3d0c5..e44b42a01 100644
--- a/Minecraft.Client/Cross64/Cross64Extras/Cross64Stubs.h
+++ b/Minecraft.Client/Cross64/Cross64Extras/Cross64Stubs.h
@@ -8,7 +8,7 @@ using namespace std::chrono;
 class C4JThread;
 
 // thread local storage
-inline LPVOID TlsFree(DWORD dwTlsIndex) { return TLSStorageCross64::Instance()->Free(dwTlsIndex); }
+inline BOOL TlsFree(DWORD dwTlsIndex) { return TLSStorageCross64::Instance()->Free(dwTlsIndex); }
 inline DWORD TlsAlloc(VOID) { return TLSStorageCross64::Instance()->Alloc(); }
 inline LPVOID TlsGetValue(DWORD dwTlsIndex) { return TLSStorageCross64::Instance()->GetValue(dwTlsIndex); }
 inline BOOL TlsSetValue(DWORD dwTlsIndex, LPVOID lpTlsValue) { return TLSStorageCross64::Instance()->SetValue(dwTlsIndex, lpTlsValue); }
@@ -26,7 +26,7 @@ typedef struct _SYSTEMTIME {
 
 inline VOID GetSystemTime(LPSYSTEMTIME lpSystemTime) {
   const auto dateTime = system_clock::now();
-  const auto dp = floor<days>(dateTime);
+  const auto dp = floor<std::chrono::days>(dateTime);
 
   const year_month_day ymd{dp};
   const hh_mm_ss hms{dateTime - dp};
diff --git a/Minecraft.Client/Cross64/Cross64Extras/TLSStorage.h b/Minecraft.Client/Cross64/Cross64Extras/TLSStorage.h
index 45b600c2f..26793c9de 100644
--- a/Minecraft.Client/Cross64/Cross64Extras/TLSStorage.h
+++ b/Minecraft.Client/Cross64/Cross64Extras/TLSStorage.h
@@ -5,7 +5,7 @@ class TLSStorageCross64 {
 
   static const int sc_maxSlots = 64;
   static BOOL m_activeList[sc_maxSlots];
-  __thread static LPVOID m_values[sc_maxSlots];
+  static thread_local LPVOID m_values[sc_maxSlots];
 
 public:
   TLSStorageCross64();