diff --git a/src/game/ThreatManager.h b/src/game/ThreatManager.h
index 93bb00a3d..d21c6ff2a 100644
--- a/src/game/ThreatManager.h
+++ b/src/game/ThreatManager.h
@@ -34,7 +34,7 @@ class Creature;
 class ThreatManager;
 struct SpellEntry;
 
-#define THREAT_UPDATE_INTERVAL 1 * IN_MILLISECONDS    // Server should send threat update to client periodically each second
+#define THREAT_UPDATE_INTERVAL (1 * IN_MILLISECONDS)    // Server should send threat update to client periodically each second
 
 //==============================================================
 // Class to calculate the real threat based
diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h
index 158ee572f..356e79836 100644
--- a/src/game/WaypointMovementGenerator.h
+++ b/src/game/WaypointMovementGenerator.h
@@ -33,7 +33,7 @@
 #include <set>
 
 #define FLIGHT_TRAVEL_UPDATE  100
-#define STOP_TIME_FOR_PLAYER  3 * MINUTE * IN_MILLISECONDS  // 3 Minutes
+#define STOP_TIME_FOR_PLAYER  (3 * MINUTE * IN_MILLISECONDS)  // 3 Minutes
 
 template<class T, class P>
 class MANGOS_DLL_SPEC PathMovementBase
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index eb0927022..8a8ec7130 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -35,7 +35,7 @@ class SqlStmtParameters;
 class SqlParamBinder;
 class Database;
 
-#define MAX_QUERY_LEN   32*1024
+#define MAX_QUERY_LEN   (32*1024)
 
 //
 class MANGOS_DLL_SPEC SqlConnection
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 2b4d3b681..fbd525794 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 "12708"
+ #define REVISION_NR "12709"
 #endif // __REVISION_NR_H__