diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 27bf3bc02..751a1bd91 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -49,7 +49,6 @@
 #include "ItemEnchantmentMgr.h"
 #include "InstanceSaveMgr.h"
 #include "InstanceData.h"
-#include "AccountMgr.h"
 
 //reload commands
 bool ChatHandler::HandleReloadCommand(const char* arg)
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index 2d77c730f..24a9bfbe2 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -1261,6 +1261,8 @@ void WorldSession::HandleWhoisOpcode(WorldPacket& recv_data)
         return;
     }
 
+    normalizePlayerName (charname);
+
     Player *plr = objmgr.GetPlayer(charname.c_str());
 
     if(!plr)
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 2fc48d66f..0f5ef86f9 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -384,10 +384,15 @@ void Unit::SendMonsterMoveByPath(Path const& path, uint32 start, uint32 end, uin
 
     WorldPacket data( SMSG_MONSTER_MOVE, (GetPackGUID().size()+4+4+4+4+1+4+4+4+pathSize*4*3) );
     data.append(GetPackGUID());
-    data << GetPositionX( )
-        << GetPositionY( )
-        << GetPositionZ( );
-    data << GetOrientation( );
+    data << GetPositionX();
+    data << GetPositionY();
+    data << GetPositionZ();
+
+    // unknown field - unrelated to orientation
+    // seems to increment about 1000 for every 1.7 seconds
+    // for now, we'll just use mstime
+    data << getMSTime();
+
     data << uint8( 0 );
     data << uint32( MovementFlags );
     data << uint32( traveltime );
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 0ff701a45..8a2040401 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 "6804"
+ #define REVISION_NR "6805"
 #endif // __REVISION_NR_H__