diff --git a/BlackTemple/Illidan.lua b/BlackTemple/Illidan.lua
index bbe077a..d20ce14 100644
--- a/BlackTemple/Illidan.lua
+++ b/BlackTemple/Illidan.lua
@@ -105,8 +105,10 @@ function mod:OnBossEnable()
 
 	self:RegisterEvent("CHAT_MSG_MONSTER_YELL")
 
-	self:Log("SPELL_DAMAGE", "Damage", 40841, 40611, 40018, 40030) -- Flame Crash, Blaze, Eye Blast, Demon Fire (Eye Blast)
-	self:Log("SPELL_MISSED", "Damage", 40841, 40611, 40018, 40030) -- Flame Crash, Blaze, Eye Blast, Demon Fire (Eye Blast)
+	self:Log("SPELL_DAMAGE", "DemonFireDamage", 40030) -- Demon Fire (Eye Blast)
+	self:Log("SPELL_MISSED", "DemonFireDamage", 40030) -- Demon Fire (Eye Blast)
+	self:Log("SPELL_DAMAGE", "Damage", 40841, 40611, 40018) -- Flame Crash, Blaze, Eye Blast
+	self:Log("SPELL_MISSED", "Damage", 40841, 40611, 40018) -- Flame Crash, Blaze, Eye Blast
 end
 
 function mod:OnEngage()
@@ -304,12 +306,22 @@ function mod:CHAT_MSG_MONSTER_YELL(_, msg)
 	end
 end
 
+do
+	local prev = 0
+	function mod:DemonFireDamage(args) -- Demon Fire (Eye Blast)
+		if self:Me(args.destGUID) and args.time-prev > 1.5 then
+			prev = args.time
+			self:MessageOld(40018, "blue", "alert", CL.underyou:format(self:SpellName(40018)))
+		end
+	end
+end
+
 do
 	local prev = 0
 	function mod:Damage(args)
-		if self:Me(args.destGUID) and GetTime()-prev > 1.5 then
-			prev = GetTime()
-			self:MessageOld(args.spellId == 40030 and 40018 or args.spellId, "blue", "alert", CL.underyou:format(args.spellId == 40030 and self:SpellName(40018) or args.spellName))
+		if self:Me(args.destGUID) and args.time-prev > 1.5 then
+			prev = args.time
+			self:MessageOld(args.spellId, "blue", "alert", CL.underyou:format(args.spellName))
 		end
 	end
 end
diff --git a/BlackTemple/ShadeOfAkama.lua b/BlackTemple/ShadeOfAkama.lua
index 1d01156..e821fc7 100644
--- a/BlackTemple/ShadeOfAkama.lua
+++ b/BlackTemple/ShadeOfAkama.lua
@@ -59,12 +59,12 @@ function mod:OnBossEnable()
 		self:Log("SPELL_PERIODIC_DAMAGE", "RainOfFireDamage", 42023)
 		self:Log("SPELL_PERIODIC_MISSED", "RainOfFireDamage", 42023)
 
-		self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT")
 		self:RegisterEvent("CHAT_MSG_MONSTER_YELL")
 	end
 end
 
 function mod:OnEngage()
+	self:RegisterEvent("INSTANCE_ENCOUNTER_ENGAGE_UNIT")
 	self:MessageOld("stages", "cyan", "info", L.engaged, false)
 	self:Bar("stages", 13, L.defender, 159241) -- ability_parry / icon 132269
 	self:ScheduleTimer("Bar", 13, "stages", 32, L.defender, 159241)
diff --git a/Karazhan/ShadeOfAran.lua b/Karazhan/ShadeOfAran.lua
index aaa8a42..44e39a3 100644
--- a/Karazhan/ShadeOfAran.lua
+++ b/Karazhan/ShadeOfAran.lua
@@ -86,7 +86,7 @@ do
 		inWreath[#inWreath + 1] = args.destName
 		if not scheduled then
 			scheduled = true
-			self:Bar(30004, 21, L["flame_bar"], args.spellId)
+			self:Bar(30004, 21, args.spellName, args.spellId)
 			self:ScheduleTimer(wreathWarn, 0.4, args.spellId)
 		end
 	end
diff --git a/Serpentshrine/Locales/itIT.lua b/Serpentshrine/Locales/itIT.lua
index a9f8ae2..768d50d 100644
--- a/Serpentshrine/Locales/itIT.lua
+++ b/Serpentshrine/Locales/itIT.lua
@@ -135,7 +135,6 @@ if L then
 	--L.naga_bar = "~Naga"
 	--L.naga_soon_message = "Naga soon!"
 
-	--L.barrier = mod:SpellName(38112)
 	--L.barrier_desc = "Alert when the barriers go down."
 	--L.barrier_down_message = "Barrier %d/4 down!"
 end
diff --git a/Serpentshrine/Locales/ptBR.lua b/Serpentshrine/Locales/ptBR.lua
index 61f2a75..f05f6b4 100644
--- a/Serpentshrine/Locales/ptBR.lua
+++ b/Serpentshrine/Locales/ptBR.lua
@@ -135,7 +135,6 @@ if L then
 	--L.naga_bar = "~Naga"
 	--L.naga_soon_message = "Naga soon!"
 
-	--L.barrier = mod:SpellName(38112)
 	--L.barrier_desc = "Alert when the barriers go down."
 	--L.barrier_down_message = "Barrier %d/4 down!"
 end