diff --git a/src/server/game/Entities/Object/Position.cpp b/src/server/game/Entities/Object/Position.cpp
index bda78f7abf..7498e3ae61 100644
--- a/src/server/game/Entities/Object/Position.cpp
+++ b/src/server/game/Entities/Object/Position.cpp
@@ -23,7 +23,7 @@
 #include <G3D/g3dmath.h>
 #include <sstream>
 
-bool Position::operator==(Position const& a)
+bool Position::operator==(Position const& a) const
 {
     return (G3D::fuzzyEq(a.m_positionX, m_positionX) &&
         G3D::fuzzyEq(a.m_positionY, m_positionY) &&
diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h
index 32334fb3f0..b3b5e79319 100644
--- a/src/server/game/Entities/Object/Position.h
+++ b/src/server/game/Entities/Object/Position.h
@@ -58,9 +58,9 @@ private:
     float m_orientation;
 
 public:
-    bool operator==(Position const& a);
+    bool operator==(Position const& a) const;
 
-    inline bool operator!=(Position const& a)
+    inline bool operator!=(Position const& a) const
     {
         return !(operator==(a));
     }
diff --git a/src/server/game/Server/WorldPacket.cpp b/src/server/game/Server/WorldPacket.cpp
index e3c0a565e9..fb321a4954 100644
--- a/src/server/game/Server/WorldPacket.cpp
+++ b/src/server/game/Server/WorldPacket.cpp
@@ -25,7 +25,7 @@
 void WorldPacket::Compress(z_stream* compressionStream)
 {
     OpcodeServer uncompressedOpcode = OpcodeServer(GetOpcode());
-    if (uncompressedOpcode & COMPRESSED_OPCODE_MASK)
+    if (uncompressedOpcode & AsUnderlyingType(COMPRESSED_OPCODE_MASK))
     {
         TC_LOG_ERROR("network", "Packet with opcode 0x%04X is already compressed!", uncompressedOpcode);
         return;