diff --git a/game/modules/tome/data/zones/maze/npcs.lua b/game/modules/tome/data/zones/maze/npcs.lua
index 76bc71ca2152e2dfa18ed6271a4bc37682ae5a30..b06cd4fe184c7f3e24e4166d49d9fdd760bd8fb0 100644
--- a/game/modules/tome/data/zones/maze/npcs.lua
+++ b/game/modules/tome/data/zones/maze/npcs.lua
@@ -63,7 +63,7 @@ newEntity{ define_as = "MINOTAUR_MAZE",
 	ai = "dumb_talented_simple", ai_state = { talent_in=1, },
 
 	on_die = function(self, who)
-		who:resolveSource():grantQuest("starter-zones")
-		who:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "maze")
+		game.player:resolveSource():grantQuest("starter-zones")
+		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "maze")
 	end,
 }
diff --git a/game/modules/tome/data/zones/old-forest/npcs.lua b/game/modules/tome/data/zones/old-forest/npcs.lua
index 4d8e46dcd026a3206a1fcc3c03a8b9f00ee1afd5..c61e529d417fa44febf795ae593d727941e90fd9 100644
--- a/game/modules/tome/data/zones/old-forest/npcs.lua
+++ b/game/modules/tome/data/zones/old-forest/npcs.lua
@@ -64,7 +64,7 @@ newEntity{ define_as = "OLD_MAN_WILLOW",
 	ai = "dumb_talented_simple", ai_state = { talent_in=3, },
 
 	on_die = function(self, who)
-		who:resolveSource():grantQuest("starter-zones")
-		who:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "old-forest")
+		game.player:resolveSource():grantQuest("starter-zones")
+		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "old-forest")
 	end,
 }
diff --git a/game/modules/tome/data/zones/sandworm-lair/npcs.lua b/game/modules/tome/data/zones/sandworm-lair/npcs.lua
index 27445ff3907bbb0775cd16c710bb3f275a28ae04..330c555ae731957569a5cca2eb8cfd16be0b4f93 100644
--- a/game/modules/tome/data/zones/sandworm-lair/npcs.lua
+++ b/game/modules/tome/data/zones/sandworm-lair/npcs.lua
@@ -86,7 +86,7 @@ newEntity{ define_as = "SANDWORM_QUEEN",
 	ai = "dumb_talented_simple", ai_state = { talent_in=2, },
 
 	on_die = function(self, who)
-		who:resolveSource():grantQuest("starter-zones")
-		who:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "sandworm-lair")
+		game.player:resolveSource():grantQuest("starter-zones")
+		game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "sandworm-lair")
 	end,
 }
diff --git a/game/modules/tome/data/zones/tol-falas/npcs.lua b/game/modules/tome/data/zones/tol-falas/npcs.lua
index d7bc9ccaf3e80a0f6a82449c669d2937daf1b41b..6bba138be7cdc523ea97bcd4c9200f94e8b9e6c7 100644
--- a/game/modules/tome/data/zones/tol-falas/npcs.lua
+++ b/game/modules/tome/data/zones/tol-falas/npcs.lua
@@ -78,8 +78,8 @@ newEntity{ define_as = "THE_MASTER",
 	ai = "dumb_talented_simple", ai_state = { talent_in=1, },
 
 	on_die = function(self, who)
-		world:gainAchievement("VAMPIRE_CRUSHER", who:resolveSource())
-		who:resolveSource():grantQuest("tol-falas")
-		who:resolveSource():setQuestStatus("tol-falas", engine.Quest.DONE)
+		world:gainAchievement("VAMPIRE_CRUSHER", game.player:resolveSource())
+		game.player:resolveSource():grantQuest("tol-falas")
+		game.player:resolveSource():setQuestStatus("tol-falas", engine.Quest.DONE)
 	end,
 }
diff --git a/game/modules/tome/data/zones/tower-amon-sul/npcs.lua b/game/modules/tome/data/zones/tower-amon-sul/npcs.lua
index a8923b83ba1998c38a73eae1100890153b23122a..0be794d0e7f2506cd8ab1dc735e734bdcbe69063 100644
--- a/game/modules/tome/data/zones/tower-amon-sul/npcs.lua
+++ b/game/modules/tome/data/zones/tower-amon-sul/npcs.lua
@@ -52,6 +52,6 @@ newEntity{ define_as = "SHADE_OF_ANGMAR",
 	ai = "dumb_talented_simple", ai_state = { talent_in=4, },
 
 	on_die = function(self, who)
-		who:resolveSource():setQuestStatus("start-dunadan", engine.Quest.COMPLETED, "amon-sul")
+		game.player:resolveSource():setQuestStatus("start-dunadan", engine.Quest.COMPLETED, "amon-sul")
 	end,
 }
diff --git a/game/modules/tome/data/zones/trollshaws/npcs.lua b/game/modules/tome/data/zones/trollshaws/npcs.lua
index 78737b578f55106a1dbbb14ca0d18a0b5fd2af81..11291bf1b0746be1352346f2f477c69980ae34a6 100644
--- a/game/modules/tome/data/zones/trollshaws/npcs.lua
+++ b/game/modules/tome/data/zones/trollshaws/npcs.lua
@@ -55,6 +55,6 @@ newEntity{ define_as = "TROLL_BILL",
 	ai = "dumb_talented_simple", ai_state = { talent_in=4, },
 
 	on_die = function(self, who)
-		who:resolveSource():setQuestStatus("start-dunadan", engine.Quest.COMPLETED, "trollshaws")
+		game.player:resolveSource():setQuestStatus("start-dunadan", engine.Quest.COMPLETED, "trollshaws")
 	end,
 }