diff --git a/.contrib/Parser/DATAS/01 - Dungeons Raids/01 - Classic/Gnomeregan.lua b/.contrib/Parser/DATAS/01 - Dungeons Raids/01 - Classic/Gnomeregan.lua
index ef3ac86402..af9b868a9f 100644
--- a/.contrib/Parser/DATAS/01 - Dungeons Raids/01 - Classic/Gnomeregan.lua	
+++ b/.contrib/Parser/DATAS/01 - Dungeons Raids/01 - Classic/Gnomeregan.lua	
@@ -420,7 +420,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
 					["lvl"] = 25,
 				}),
 				q(2842, {	-- Chief Engineer Scooty
-					["description"] = "You cannot get this quest until you accept the Rig Wars quest. Accept Rig Wars, then this guy gives you the quest to get to Gnomer safely...",
+					["description"] = "Although this quest is available from level 20, if you take or complete it, it makes it impossible to obtain the 'Rig Wars' quest, which is available at level 25. However, if you take 'Rig Wars' first, you can have both quest without problems.",
 					["qg"] = 3413,	-- Sovik <Engineering Supplies>
 					["coord"] = { 75.6, 25.2, ORGRIMMAR },
 					["timeline"] = { REMOVED_4_0_3 },
@@ -615,6 +615,7 @@ root(ROOTS.Instances, expansion(EXPANSION.CLASSIC, {
 					["coord"] = { 75.8, 25.2, ORGRIMMAR },
 					["timeline"] = { REMOVED_4_0_3 },
 					["races"] = HORDE_ONLY,
+					["lockCriteria"] = { 1, "questID", 2842 },
 					["lvl"] = 25,
 					["groups"] = {
 						objective(1, {	-- 0/1 Rig Blueprints
diff --git a/.contrib/Parser/DATAS/03 - World Drops/01 Rooted/1 - Classic.lua b/.contrib/Parser/DATAS/03 - World Drops/01 Rooted/1 - Classic.lua
index d9c4b6d7b9..d3428a9ebc 100644
--- a/.contrib/Parser/DATAS/03 - World Drops/01 Rooted/1 - Classic.lua	
+++ b/.contrib/Parser/DATAS/03 - World Drops/01 Rooted/1 - Classic.lua	
@@ -5408,15 +5408,13 @@ root(ROOTS.WorldDrops, expansion(EXPANSION.CLASSIC, {
 		}),
 		i(6889, {	-- Small Egg
 			-- #if BEFORE 4.0.3
-			["coord"] = { 44.0, 48.0, DARKSHORE },
-			["maps"] = {
-				DARKSHORE,
-				LOCH_MODAN,
-				MULGORE,
-				REDRIDGE_MOUNTAINS,
-				TELDRASSIL,
-				THE_BARRENS,
-				WESTFALL,
+			["coord"] = {
+				{ 44.0, 48.0, DARKSHORE },
+				{ 76.6, 68.2, LOCH_MODAN },
+				{ 40.6, 59.0, MULGORE },
+				{ 52.0, 38.8, REDRIDGE_MOUNTAINS },
+				{ 54.6, 60.6, TELDRASSIL },
+				{ 61.2, 59.8, WESTFALL },
 			},
 			-- #endif
 			-- #if AFTER TBC
diff --git a/.contrib/Parser/DATAS/09 - Crafted Items/05 - Mists of Pandaria.lua b/.contrib/Parser/DATAS/09 - Crafted Items/05 - Mists of Pandaria.lua
index fe1a055e9f..d201e4b4e2 100644
--- a/.contrib/Parser/DATAS/09 - Crafted Items/05 - Mists of Pandaria.lua	
+++ b/.contrib/Parser/DATAS/09 - Crafted Items/05 - Mists of Pandaria.lua	
@@ -682,7 +682,7 @@ root(ROOTS.Craftables, expansion(EXPANSION.MOP, applyclassicphase(MOP_PHASE_ONE,
 			i(74728),	-- Enchant Weapon - River's Song
 			i(74723),	-- Enchant Weapon - Windsong
 			-- #if ANYCLASSIC
-			applyclassicphase(MOP_PHASE_RISE_OF_THE_THUNDER_KING,i(254314, {["timeline"] = {ADDED_5_5_1}})),	-- Enchant Weapon - Tyrann
+			applyclassicphase(MOP_PHASE_RISE_OF_THE_THUNDER_KING,i(254314, {["timeline"] = {ADDED_5_5_1}})),	-- Enchant Weapon - Tyranny
 			-- #endif
 		}),
 	}),