diff --git a/Data/expansions/classic/opcodes.json b/Data/expansions/classic/opcodes.json
index e364588e..e5387453 100644
--- a/Data/expansions/classic/opcodes.json
+++ b/Data/expansions/classic/opcodes.json
@@ -180,7 +180,7 @@
   "CMSG_SELL_ITEM": "0x1A0",
   "SMSG_SELL_ITEM": "0x1A1",
   "CMSG_BUY_ITEM": "0x1A2",
-  "CMSG_BUYBACK_ITEM": "0x290",
+  "CMSG_BUYBACK_ITEM": "0x1A6",
   "SMSG_BUY_FAILED": "0x1A5",
   "CMSG_TRAINER_LIST": "0x1B0",
   "SMSG_TRAINER_LIST": "0x1B1",
diff --git a/Data/expansions/turtle/opcodes.json b/Data/expansions/turtle/opcodes.json
index 608f5c83..9a9e1806 100644
--- a/Data/expansions/turtle/opcodes.json
+++ b/Data/expansions/turtle/opcodes.json
@@ -80,8 +80,8 @@
   "CMSG_GUILD_MOTD": "0x091",
   "SMSG_GUILD_INFO": "0x088",
   "SMSG_GUILD_ROSTER": "0x08A",
-  "CMSG_GUILD_QUERY": "0x051",
-  "SMSG_GUILD_QUERY_RESPONSE": "0x052",
+  "CMSG_GUILD_QUERY": "0x054",
+  "SMSG_GUILD_QUERY_RESPONSE": "0x055",
   "SMSG_GUILD_INVITE": "0x083",
   "CMSG_GUILD_REMOVE": "0x08E",
   "SMSG_GUILD_EVENT": "0x092",
@@ -103,6 +103,7 @@
   "CMSG_SET_ACTIVE_MOVER": "0x26A",
   "CMSG_BINDER_ACTIVATE": "0x1B5",
   "SMSG_LOG_XPGAIN": "0x1D0",
+  "_NOTE_MONSTER_MOVE": "These look swapped vs vanilla (0x0DD/0x2FB) but may be intentional Turtle WoW changes. Check if NPC movement breaks.",
   "SMSG_MONSTER_MOVE": "0x2FB",
   "SMSG_COMPRESSED_MOVES": "0x06B",
   "CMSG_ATTACKSWING": "0x141",