Index: trunk/src/game/Chat.cpp
===================================================================
--- trunk/src/game/Chat.cpp (revision 79)
+++ trunk/src/game/Chat.cpp (revision 83)
@@ -634,5 +634,5 @@
     for(uint32 i = 0; table[i].Name != NULL; i++)
     {
-        if( *subcmd && !hasStringAbbr(table[i].Name, subcmd))
+        if( !hasStringAbbr(table[i].Name, cmd.c_str()) )
             continue;
 
@@ -722,5 +722,5 @@
             continue;
 
-        if( !hasStringAbbr(table[i].Name, subcmd) )
+        if( *subcmd && !hasStringAbbr(table[i].Name, subcmd))
             continue;
 
Index: trunk/src/game/WorldSocket.cpp
===================================================================
--- trunk/src/game/WorldSocket.cpp (revision 78)
+++ trunk/src/game/WorldSocket.cpp (revision 83)
@@ -679,5 +679,5 @@
   uint32 BuiltNumberClient;
   uint32 id, security;
-  uint8 expansion = 0;
+  //uint8 expansion = 0;
   LocaleConstant locale;
   std::string account;
Index: trunk/src/game/World.cpp
===================================================================
--- trunk/src/game/World.cpp (revision 51)
+++ trunk/src/game/World.cpp (revision 83)
@@ -230,5 +230,5 @@
   packet << uint8 (0);
   packet << uint32 (0);
-  packet << uint8 (s->IsTBC () ? 1 : 0); // 0 - normal, 1 - TBC, must be set in database manually for each account
+  packet << uint8 (s->Expansion () ? 1 : 0); // 0 - normal, 1 - TBC, must be set in database manually for each account
   s->SendPacket (&packet);
 
@@ -267,5 +267,5 @@
     packet << uint8 (0);
     packet << uint32 (0);
-    packet << uint8 (sess->IsTBC () ? 1 : 0); // 0 - normal, 1 - TBC, must be set in database manually for each account
+    packet << uint8 (sess->Expansion () ? 1 : 0); // 0 - normal, 1 - TBC, must be set in database manually for each account
     packet << uint32(GetQueuePos (sess));
     sess->SendPacket (&packet);
Index: trunk/src/game/AccountMgr.cpp
===================================================================
--- trunk/src/game/AccountMgr.cpp (revision 79)
+++ trunk/src/game/AccountMgr.cpp (revision 83)
@@ -19,7 +19,7 @@
  */
 
-#include "AccountAccessor.h"
+#include "AccountMgr.h"
 #include "Database/DatabaseEnv.h"
-#include "ObjectMgr.h"
+#include "ObjectAccessor.h"
 #include "Player.h"
 #include "Policies/SingletonImp.h"
Index: trunk/src/game/ObjectMgr.cpp
===================================================================
--- trunk/src/game/ObjectMgr.cpp (revision 79)
+++ trunk/src/game/ObjectMgr.cpp (revision 83)
@@ -321,5 +321,4 @@
         {
             bidder_accId = GetPlayerAccountIdByGUID(bidder_guid);
-            bidder_security = GetSecurityByAccount(bidder_accId);
             bidder_security = accmgr.GetSecurity(bidder_accId);