diff --git a/game/engines/default/engine/Entity.lua b/game/engines/default/engine/Entity.lua
index f0165acd26088de8fc5d8c076b94f69805eafc87..99d3f8149411d5dd91777eb2c5840455b8e054a3 100644
--- a/game/engines/default/engine/Entity.lua
+++ b/game/engines/default/engine/Entity.lua
@@ -974,6 +974,7 @@ function _M:loadList(file, no_default, res, mod, loaded)
 	setfenv(f, setmetatable(newenv, {__index=_G}))
 	f()
 	setfenv(f, {})
+	newenv.currentZone = nil
 
 	self:triggerHook{"Entity:loadList", file=file, no_default=no_default, res=res, mod=mod, loaded=loaded}
 
diff --git a/game/engines/default/engine/utils.lua b/game/engines/default/engine/utils.lua
index 4fb29398ca25541130c9698bdaaa61dec236b49b..e81efbf7ecf14ae6e179fddc1d81bad494e6141b 100644
--- a/game/engines/default/engine/utils.lua
+++ b/game/engines/default/engine/utils.lua
@@ -1808,7 +1808,11 @@ function util.findAllReferences(t, what)
 			if type(e) == "function" then
 				local fenv = getfenv(e)
 				local data = table.clone(data)
-				data[#data+1] = "e:fenv:"..tostring(k)
+				if fenv.__CLASSNAME then
+					data[#data+1] = "e:fenv["..fenv.__CLASSNAME"]:"..tostring(k)
+				else
+					data[#data+1] = "e:fenv[--]:"..tostring(k)
+				end
 				recurs(fenv, data)
 			end
 
diff --git a/game/engines/default/engine/version.lua b/game/engines/default/engine/version.lua
index ea605b02a9374ef9d8aba0359f373a1afc591f33..295887274c00c38ca4472ad99f51663ca031cb07 100644
--- a/game/engines/default/engine/version.lua
+++ b/game/engines/default/engine/version.lua
@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 -- Engine Version
-engine.version = {1,2,0,"te4",17}
+engine.version = {1,2,1,"te4",17}
 engine.require_c_core = engine.version[5]
 engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3])
 
diff --git a/game/modules/tome/class/Grid.lua b/game/modules/tome/class/Grid.lua
index df34e80b017b665f620bb8f6722a43f8056a028a..4283c6ff62f0faaa89b5c3fb3a3599d6a5f19478 100644
--- a/game/modules/tome/class/Grid.lua
+++ b/game/modules/tome/class/Grid.lua
@@ -145,6 +145,7 @@ function _M:getName()
 end
 
 function _M:tooltip(x, y)
+	if not x or not y then return tstring("") end
 	local tstr
 	local dist = nil
 	if game.player.x and game.player.y then dist = tstring{" (range: ", {"font", "italic"}, {"color", "LIGHT_GREEN"}, tostring(core.fov.distance(game.player.x, game.player.y, x, y)), {"color", "LAST"}, {"font", "normal"}, ")"} end
diff --git a/game/modules/tome/data/talents/techniques/combat-training.lua b/game/modules/tome/data/talents/techniques/combat-training.lua
index f7d3995f7495d92cf904c55219a1054a794b7857..6678a0bacd1a5d88a2d1d679613376c0699efe27 100644
--- a/game/modules/tome/data/talents/techniques/combat-training.lua
+++ b/game/modules/tome/data/talents/techniques/combat-training.lua
@@ -42,6 +42,7 @@ newTalent{
 	points = 5,
 	require = {stat = {str = function(level) return 16 + (level + 2) * (level - 1) end}},
 	ArmorEffect = function(self, t)  -- Becomes more effective with heavier armors
+		if not self:getInven("BODY") then return 0 end
 		local am = self:getInven("BODY")[1] or {}
 --		if am.subtype == "cloth" then return 0.75
 --		elseif am.subtype == "light" then return 1.0
diff --git a/game/modules/tome/init.lua b/game/modules/tome/init.lua
index dc7bb680691623c7fd05259daf349ee8743a6551..f6ff3599ace4518e7c3fee7a7ebb12b5ca9baa19 100644
--- a/game/modules/tome/init.lua
+++ b/game/modules/tome/init.lua
@@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy"
 short_name = "tome"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://te4.org/"
-version = {1,2,0}
-engine = {1,2,0,"te4"}
+version = {1,2,1}
+engine = {1,2,1,"te4"}
 description = [[
 Welcome to Maj'Eyal.