diff --git a/modules/castbar.lua b/modules/castbar.lua
index d925da9e..2c0860b7 100644
--- a/modules/castbar.lua
+++ b/modules/castbar.lua
@@ -145,7 +145,7 @@ pfUI:RegisterModule("castbar", "vanilla", function ()
       
       if not cast and UnitChannelInfo then
         -- scan for channel spells if no cast was found
-        channel, nameSubtext, text, texture, startTime, endTime, isTradeSkill = UnitChannelInfo(query)
+        channel, nameSubtext, text, texture, startTime, endTime, isTradeSkill = UnitChannelInfo(this.unitstr or this.unitname)
         cast = channel
       end
 
diff --git a/modules/mapreveal.lua b/modules/mapreveal.lua
index 594b0ff3..b6ed64c5 100644
--- a/modules/mapreveal.lua
+++ b/modules/mapreveal.lua
@@ -69,6 +69,8 @@ pfUI:RegisterModule("mapreveal", "vanilla:tbc", function ()
 
   local explores = {}
   local explorecaches = {}
+  local alreadyknown = {}
+  local BASE_WORLDMAP_OVERLAYS = nil
 
   local exploreEnter = function()
     WorldMapTooltip:ClearLines()