diff --git a/src/server/game/Maps/MapUpdater.h b/src/server/game/Maps/MapUpdater.h
index 7b9c4443a5..c499110173 100644
--- a/src/server/game/Maps/MapUpdater.h
+++ b/src/server/game/Maps/MapUpdater.h
@@ -25,6 +25,7 @@
 #include <condition_variable>
 #include "ProducerConsumerQueue.h"
 
+class MapUpdateRequest;
 class Map;
 
 class MapUpdater
@@ -48,7 +49,7 @@ class MapUpdater
 
     private:
 
-        ProducerConsumerQueue <MapUpdateRequest*> _queue;
+        ProducerConsumerQueue<MapUpdateRequest*> _queue;
 
         std::vector<std::thread> _workerThreads;
         std::atomic<bool> _cancelationToken;
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 06ae5d4f63..7ad4390735 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -1002,8 +1002,8 @@ class WorldSession
         bool m_playerSave;
         LocaleConstant m_sessionDbcLocale;
         LocaleConstant m_sessionDbLocaleIndex;
-        std::atomic_uint32_t m_latency;
-        std::atomic_uint32_t m_clientTimeDelay;
+        std::atomic<uint32> m_latency;
+        std::atomic<uint32> m_clientTimeDelay;
         AccountData m_accountData[NUM_ACCOUNT_DATA_TYPES];
         uint32 m_Tutorials[MAX_ACCOUNT_TUTORIAL_VALUES];
         bool   m_TutorialsChanged;
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index d14d5adf37..22dece5d4f 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -524,7 +524,7 @@ class World
             return instance;
         }
 
-        static std::atomic_uint32_t m_worldLoopCounter;
+        static std::atomic<uint32> m_worldLoopCounter;
 
         WorldSession* FindSession(uint32 id) const;
         void AddSession(WorldSession* s);
diff --git a/src/server/shared/Cryptography/OpenSSLCrypto.cpp b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
index d4e06dfd66..6d8d6584e6 100644
--- a/src/server/shared/Cryptography/OpenSSLCrypto.cpp
+++ b/src/server/shared/Cryptography/OpenSSLCrypto.cpp
@@ -33,7 +33,7 @@ static void lockingCallback(int mode, int type, const char* /*file*/, int /*line
 
 static void threadIdCallback(CRYPTO_THREADID * id)
 {
-    CRYPTO_THREADID_set_numeric(id, std::this_thread::get_id().hash());
+    CRYPTO_THREADID_set_numeric(id, std::hash<std::thread::id>()(std::this_thread::get_id()));
 }
 
 void OpenSSLCrypto::threadsSetup()