diff --git a/sql/updates/00014_xxxxx_01_realmd_account_access.sql b/sql/updates/00014_xxxxx_01_realmd_account_access.sql
index 486920919..e70fe037c 100644
--- a/sql/updates/00014_xxxxx_01_realmd_account_access.sql
+++ b/sql/updates/00014_xxxxx_01_realmd_account_access.sql
@@ -9,7 +9,7 @@ CREATE TABLE `account_access` (
   `gmlevel` tinyint(3) unsigned NOT NULL,
   `RealmID` int(11) NOT NULL DEFAULT '-1',
   PRIMARY KEY (`id`,`RealmID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=MYISAM DEFAULT CHARSET=utf8;
 
 INSERT INTO `account_access` VALUES
 (1,3,-1),
diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp
index a3313a26e..091a38590 100644
--- a/src/game/QueryHandler.cpp
+++ b/src/game/QueryHandler.cpp
@@ -157,8 +157,8 @@ void WorldSession::HandleCreatureQueryOpcode(WorldPacket& recv_data)
     {
         int loc_idx = GetSessionDbLocaleIndex();
 
-        std::string name = ci->Name;
-        std::string subName = ci->SubName;
+        char const* name = ci->Name;
+        char const* subName = ci->SubName;
         sObjectMgr.GetCreatureLocaleStrings(entry, loc_idx, &name, &subName);
 
         DETAIL_LOG("WORLD: CMSG_CREATURE_QUERY '%s' - Entry: %u.", ci->Name, entry);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index df4f56c12..c44b4464d 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 "0016"
+ #define REVISION_NR "0017"
 #endif // __REVISION_NR_H__