diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp
index 231b86d87..6571b053d 100644
--- a/src/server/authserver/Server/AuthSocket.cpp
+++ b/src/server/authserver/Server/AuthSocket.cpp
@@ -213,7 +213,7 @@ void AuthSocket::OnRead()
     uint32 challengesInARowRealmList = 0;
 
     uint8 _cmd;
-    while (1)
+    while (true)
     {
         if (!socket().recv_soft((char*)&_cmd, 1))
             return;
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 4895cd3e7..582ccca86 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -747,7 +747,7 @@ public:
     /// Get a server configuration element (see #WorldConfigs)
     bool getBoolConfig(WorldBoolConfigs index) const
     {
-        return index < BOOL_CONFIG_VALUE_COUNT ? m_bool_configs[index] : 0;
+        return index < BOOL_CONFIG_VALUE_COUNT ? m_bool_configs[index] : false;
     }
 
     /// Set a server configuration element (see #WorldConfigs)
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp
index 13800925b..d7530c5d1 100644
--- a/src/tools/mmaps_generator/MapBuilder.cpp
+++ b/src/tools/mmaps_generator/MapBuilder.cpp
@@ -378,7 +378,7 @@ namespace MMAP
 
     void MapBuilder::WorkerThread()
     {
-        while (1)
+        while (true)
         {
             uint32 mapId = 0;
 
@@ -885,7 +885,7 @@ namespace MMAP
 
             // now that tile is written to disk, we can unload it
             navMesh->removeTile(tileRef, nullptr, nullptr);
-        } while (0);
+        } while (false);
 
         if (m_debugOutput)
         {