diff --git a/src/game/ObjectGuid.cpp b/src/game/ObjectGuid.cpp
index c6b97c560..ac12891f0 100644
--- a/src/game/ObjectGuid.cpp
+++ b/src/game/ObjectGuid.cpp
@@ -66,8 +66,8 @@ ByteBuffer& operator<< (ByteBuffer& buf, PackedGuid const& guid)
     return buf;
 }
 
-ByteBuffer &operator>>(ByteBuffer& buf, PackedGuidReader& guid)
+ByteBuffer &operator>>(ByteBuffer& buf, PackedGuidReader const& guid)
 {
-    guid.m_guidRef.Set(buf.readPackGUID());
+    guid.m_guidPtr->Set(buf.readPackGUID());
     return buf;
 }
diff --git a/src/game/ObjectGuid.h b/src/game/ObjectGuid.h
index 37bcb06b0..fca0a8fc4 100644
--- a/src/game/ObjectGuid.h
+++ b/src/game/ObjectGuid.h
@@ -118,8 +118,8 @@ class PackedGuid;
 
 struct PackedGuidReader
 {
-    explicit PackedGuidReader(ObjectGuid& guid) : m_guidRef(guid) {}
-    ObjectGuid& m_guidRef;
+    explicit PackedGuidReader(ObjectGuid& guid) : m_guidPtr(&guid) {}
+    ObjectGuid* m_guidPtr;
 };
 
 class ObjectGuid
@@ -233,7 +233,7 @@ ByteBuffer& operator<< (ByteBuffer& buf, ObjectGuid const& guid);
 ByteBuffer& operator>> (ByteBuffer& buf, ObjectGuid&       guid);
 
 ByteBuffer& operator<< (ByteBuffer& buf, PackedGuid const& guid);
-ByteBuffer& operator>> (ByteBuffer& buf, PackedGuidReader& guid);
+ByteBuffer& operator>> (ByteBuffer& buf, PackedGuidReader const& guid);
 
 inline PackedGuid ObjectGuid::WriteAsPacked() const { return PackedGuid(*this); }
 
diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h
index b7601f08d..2670003c1 100644
--- a/src/shared/ByteBuffer.h
+++ b/src/shared/ByteBuffer.h
@@ -240,7 +240,7 @@ class ByteBuffer
         }
 
         template<class T>
-        ByteBuffer &operator>>(Unused<T> &)
+        ByteBuffer &operator>>(Unused<T> const&)
         {
             read_skip<T>();
             return *this;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 54aaa0dcb..143f9465e 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 "9552"
+ #define REVISION_NR "9553"
 #endif // __REVISION_NR_H__