diff --git a/src/game/World.cpp b/src/game/World.cpp
index 8a9b57e58..e1efb651a 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1961,7 +1961,7 @@ void World::LoadDBVersion()
         m_CreatureEventAIVersion = "Unknown creature EventAI.";
 }
 
-void World::setConfig(eConfigUint32Values index, char const* fieldname, uint32 defvalue)
+void World::setConfig(eConfigUInt32Values index, char const* fieldname, uint32 defvalue)
 {
     setConfig(index, sConfig.GetIntDefault(fieldname,defvalue));
 }
@@ -1971,7 +1971,7 @@ void World::setConfig(eConfigInt32Values index, char const* fieldname, int32 def
     setConfig(index, sConfig.GetIntDefault(fieldname,defvalue));
 }
 
-void World::setConfig(eConfigFLoatValues index, char const* fieldname, float defvalue)
+void World::setConfig(eConfigFloatValues index, char const* fieldname, float defvalue)
 {
     setConfig(index, sConfig.GetFloatDefault(fieldname,defvalue));
 }
@@ -1981,7 +1981,7 @@ void World::setConfig( eConfigBoolValues index, char const* fieldname, bool defv
     setConfig(index, sConfig.GetBoolDefault(fieldname,defvalue));
 }
 
-void World::setConfigPos(eConfigUint32Values index, char const* fieldname, uint32 defvalue)
+void World::setConfigPos(eConfigUInt32Values index, char const* fieldname, uint32 defvalue)
 {
     setConfig(index, fieldname, defvalue);
     if (int32(getConfig(index)) < 0)
@@ -1991,7 +1991,7 @@ void World::setConfigPos(eConfigUint32Values index, char const* fieldname, uint3
     }
 }
 
-void World::setConfigPos(eConfigFLoatValues index, char const* fieldname, float defvalue)
+void World::setConfigPos(eConfigFloatValues index, char const* fieldname, float defvalue)
 {
     setConfig(index, fieldname, defvalue);
     if (getConfig(index) < 0.0f)
@@ -2001,7 +2001,7 @@ void World::setConfigPos(eConfigFLoatValues index, char const* fieldname, float
     }
 }
 
-void World::setConfigMin(eConfigUint32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue)
+void World::setConfigMin(eConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue)
 {
     setConfig(index, fieldname, defvalue);
     if (getConfig(index) < minvalue)
@@ -2021,7 +2021,7 @@ void World::setConfigMin(eConfigInt32Values index, char const* fieldname, int32
     }
 }
 
-void World::setConfigMin(eConfigFLoatValues index, char const* fieldname, float defvalue, float minvalue)
+void World::setConfigMin(eConfigFloatValues index, char const* fieldname, float defvalue, float minvalue)
 {
     setConfig(index, fieldname, defvalue);
     if (getConfig(index) < minvalue)
@@ -2031,7 +2031,7 @@ void World::setConfigMin(eConfigFLoatValues index, char const* fieldname, float
     }
 }
 
-void World::setConfigMinMax(eConfigUint32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue)
+void World::setConfigMinMax(eConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue)
 {
     setConfig(index, fieldname, defvalue);
     if (getConfig(index) < minvalue)
@@ -2061,7 +2061,7 @@ void World::setConfigMinMax(eConfigInt32Values index, char const* fieldname, int
     }
 }
 
-void World::setConfigMinMax(eConfigFLoatValues index, char const* fieldname, float defvalue, float minvalue, float maxvalue)
+void World::setConfigMinMax(eConfigFloatValues index, char const* fieldname, float defvalue, float minvalue, float maxvalue)
 {
     setConfig(index, fieldname, defvalue);
     if (getConfig(index) < minvalue)
@@ -2076,7 +2076,7 @@ void World::setConfigMinMax(eConfigFLoatValues index, char const* fieldname, flo
     }
 }
 
-bool World::configNoReload(bool reload, eConfigUint32Values index, char const* fieldname, uint32 defvalue)
+bool World::configNoReload(bool reload, eConfigUInt32Values index, char const* fieldname, uint32 defvalue)
 {
     if (!reload)
         return true;
@@ -2100,7 +2100,7 @@ bool World::configNoReload(bool reload, eConfigInt32Values index, char const* fi
     return false;
 }
 
-bool World::configNoReload(bool reload, eConfigFLoatValues index, char const* fieldname, float defvalue)
+bool World::configNoReload(bool reload, eConfigFloatValues index, char const* fieldname, float defvalue)
 {
     if (!reload)
         return true;
diff --git a/src/game/World.h b/src/game/World.h
index 3c201437c..f65015ced 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -81,7 +81,7 @@ enum WorldTimers
 };
 
 /// Configuration elements
-enum eConfigUint32Values
+enum eConfigUInt32Values
 {
     CONFIG_UINT32_COMPRESSION = 0,
     CONFIG_UINT32_INTERVAL_SAVE,
@@ -184,7 +184,7 @@ enum eConfigInt32Values
 };
 
 /// Server config
-enum eConfigFLoatValues
+enum eConfigFloatValues
 {
     CONFIG_FLOAT_RATE_HEALTH = 0,
     CONFIG_FLOAT_RATE_POWER_MANA,
@@ -491,15 +491,15 @@ class World
 
         void UpdateSessions( uint32 diff );
 
-        /// et a server configuration element (see #eConfigFLoatValues)
-        void setConfig(eConfigFLoatValues index,float value) { m_configFloatValues[index]=value; }
-        /// Get a server configuration element (see #eConfigFLoatValues)
-        float getConfig(eConfigFLoatValues rate) const { return m_configFloatValues[rate]; }
+        /// et a server configuration element (see #eConfigFloatValues)
+        void setConfig(eConfigFloatValues index,float value) { m_configFloatValues[index]=value; }
+        /// Get a server configuration element (see #eConfigFloatValues)
+        float getConfig(eConfigFloatValues rate) const { return m_configFloatValues[rate]; }
 
-        /// Set a server configuration element (see #eConfigUint32Values)
-        void setConfig(eConfigUint32Values index, uint32 value) { m_configUint32Values[index]=value; }
-        /// Get a server configuration element (see #eConfigUint32Values)
-        uint32 getConfig(eConfigUint32Values index) const { return m_configUint32Values[index]; }
+        /// Set a server configuration element (see #eConfigUInt32Values)
+        void setConfig(eConfigUInt32Values index, uint32 value) { m_configUint32Values[index]=value; }
+        /// Get a server configuration element (see #eConfigUInt32Values)
+        uint32 getConfig(eConfigUInt32Values index) const { return m_configUint32Values[index]; }
 
         /// Set a server configuration element (see #eConfigInt32Values)
         void setConfig(eConfigInt32Values index, int32 value) { m_configInt32Values[index]=value; }
@@ -562,21 +562,21 @@ class World
         void InitDailyQuestResetTime();
         void ResetDailyQuests();
     private:
-        void setConfig(eConfigUint32Values index, char const* fieldname, uint32 defvalue);
+        void setConfig(eConfigUInt32Values index, char const* fieldname, uint32 defvalue);
         void setConfig(eConfigInt32Values index, char const* fieldname, int32 defvalue);
-        void setConfig(eConfigFLoatValues index, char const* fieldname, float defvalue);
+        void setConfig(eConfigFloatValues index, char const* fieldname, float defvalue);
         void setConfig(eConfigBoolValues index, char const* fieldname, bool defvalue);
-        void setConfigPos(eConfigUint32Values index, char const* fieldname, uint32 defvalue);
-        void setConfigPos(eConfigFLoatValues index, char const* fieldname, float defvalue);
-        void setConfigMin(eConfigUint32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue);
+        void setConfigPos(eConfigUInt32Values index, char const* fieldname, uint32 defvalue);
+        void setConfigPos(eConfigFloatValues index, char const* fieldname, float defvalue);
+        void setConfigMin(eConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue);
         void setConfigMin(eConfigInt32Values index, char const* fieldname, int32 defvalue, int32 minvalue);
-        void setConfigMin(eConfigFLoatValues index, char const* fieldname, float defvalue, float minvalue);
-        void setConfigMinMax(eConfigUint32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue);
+        void setConfigMin(eConfigFloatValues index, char const* fieldname, float defvalue, float minvalue);
+        void setConfigMinMax(eConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue);
         void setConfigMinMax(eConfigInt32Values index, char const* fieldname, int32 defvalue, int32 minvalue, int32 maxvalue);
-        void setConfigMinMax(eConfigFLoatValues index, char const* fieldname, float defvalue, float minvalue, float maxvalue);
-        bool configNoReload(bool reload, eConfigUint32Values index, char const* fieldname, uint32 defvalue);
+        void setConfigMinMax(eConfigFloatValues index, char const* fieldname, float defvalue, float minvalue, float maxvalue);
+        bool configNoReload(bool reload, eConfigUInt32Values index, char const* fieldname, uint32 defvalue);
         bool configNoReload(bool reload, eConfigInt32Values index, char const* fieldname, int32 defvalue);
-        bool configNoReload(bool reload, eConfigFLoatValues index, char const* fieldname, float defvalue);
+        bool configNoReload(bool reload, eConfigFloatValues index, char const* fieldname, float defvalue);
         bool configNoReload(bool reload, eConfigBoolValues index, char const* fieldname, bool defvalue);
 
         static volatile bool m_stopEvent;
diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index c181c8d82..31b50c903 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -687,7 +687,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
 
                 return HandleAuthSession (*new_pct);
             case CMSG_KEEP_ALIVE:
-                DEBUG_LOG ("CMSG_KEEP_ALIVE ,size: %d", new_pct->size ());
+                DEBUG_LOG ("CMSG_KEEP_ALIVE ,size: "SIZEFMTD" ", new_pct->size ());
 
                 return 0;
             default:
diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp
index 11643afd3..a753435a0 100644
--- a/src/realmd/AuthSocket.cpp
+++ b/src/realmd/AuthSocket.cpp
@@ -276,11 +276,11 @@ void AuthSocket::OnRead()
                 (table[i].status == STATUS_CONNECTED ||
                 (_authed && table[i].status == STATUS_AUTHED)))
             {
-                DEBUG_LOG("[Auth] got data for cmd %u ibuf length %u", (uint32)_cmd, ibuf.GetLength());
+                DEBUG_LOG("[Auth] got data for cmd %u ibuf length "SIZEFMTD" ", (uint32)_cmd, ibuf.GetLength());
 
                 if (!(*this.*table[i].handler)())
                 {
-                    DEBUG_LOG("Command handler failed for cmd %u ibuf length %u", (uint32)_cmd, ibuf.GetLength());
+                    DEBUG_LOG("Command handler failed for cmd %u ibuf length "SIZEFMTD" ", (uint32)_cmd, ibuf.GetLength());
                     return;
                 }
                 break;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 621438e16..da42beae0 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9630"
+ #define REVISION_NR "9631"
 #endif // __REVISION_NR_H__