diff --git a/ElvUI/Libraries/oUF/elements/tags.lua b/ElvUI/Libraries/oUF/elements/tags.lua
index 97889d2..af16bfb 100644
--- a/ElvUI/Libraries/oUF/elements/tags.lua
+++ b/ElvUI/Libraries/oUF/elements/tags.lua
@@ -554,14 +554,14 @@ local function unregisterEvents(fontstr)
 	end
 end
 
-local OnEnter = function(self)
-	for _, fs in pairs(self.__mousetags) do
+local OnEnter = function()
+	for _, fs in pairs(this.__mousetags) do
 		fs:SetAlpha(1)
 	end
 end
 
-local OnLeave = function(self)
-	for _, fs in pairs(self.__mousetags) do
+local OnLeave = function()
+	for _, fs in pairs(this.__mousetags) do
 		fs:SetAlpha(0)
 	end
 end
@@ -615,9 +615,9 @@ local function Tag(self, fs, tagstr)
 		tinsert(self.__mousetags, fs)
 		fs:SetAlpha(0)
 		if not self.__HookFunc then
-			HookScript(self, 'OnEnter', function() OnEnter(this) end)
-			HookScript(self, 'OnLeave', function() OnLeave(this) end)
-			self.__HookFunc = true;
+			HookScript(self, 'OnEnter', OnEnter)
+			HookScript(self, 'OnLeave', OnLeave)
+			self.__HookFunc = true
 		end
 		tagstr = string.gsub(tagstr, '%[mouseover%]', '')
 	else
diff --git a/ElvUI/Modules/ActionBars/ActionBars.lua b/ElvUI/Modules/ActionBars/ActionBars.lua
index 1532aec..061be50 100644
--- a/ElvUI/Modules/ActionBars/ActionBars.lua
+++ b/ElvUI/Modules/ActionBars/ActionBars.lua
@@ -331,7 +331,7 @@ function AB:StyleButton(button, noBackdrop)
 	self:FixKeybindText(button)
 	E:StyleButton(button)
 
-	if(not self.handledButtons[button]) then
+	if not self.handledButtons[button] then
 		E:RegisterCooldown(buttonCooldown)
 
 		self.handledButtons[button] = true
@@ -381,7 +381,7 @@ function AB:DisableBlizzard()
 		ShapeshiftBarMiddle,
 		ShapeshiftBarRight,
 	}
-	for _, element in pairs(elements) do
+	for _, element in ipairs(elements) do
 		if element:GetObjectType() == "Frame" then
 			element:UnregisterAllEvents()
 		end
@@ -401,7 +401,7 @@ function AB:DisableBlizzard()
 		"ShapeshiftBarFrame",
 		"PETACTIONBAR_YPOS",
 	}
-	for _, frame in pairs(uiManagedFrames) do
+	for _, frame in ipairs(uiManagedFrames) do
 		UIPARENT_MANAGED_FRAME_POSITIONS[frame] = nil
 	end
 	uiManagedFrames = nil
diff --git a/ElvUI/Modules/UnitFrames/Groups/Raid.lua b/ElvUI/Modules/UnitFrames/Groups/Raid.lua
index 5e7c627..a7b1d53 100644
--- a/ElvUI/Modules/UnitFrames/Groups/Raid.lua
+++ b/ElvUI/Modules/UnitFrames/Groups/Raid.lua
@@ -32,6 +32,7 @@ function UF:Construct_RaidFrames()
 
 	self.GPS = UF:Construct_GPS(self)
 	self.InfoPanel = UF:Construct_InfoPanel(self)
+	self.Range = UF:Construct_Range(self)
 	UF:Update_StatusBars()
 	UF:Update_FontStrings()
 	self.unitframeType = "raid"
@@ -117,6 +118,8 @@ function UF:Update_RaidFrames(frame, db)
 
 	UF:Configure_RaidRoleIcons(frame)
 
+	UF:Configure_Range(frame)
+
 	frame:UpdateAllElements("ElvUI_UpdateAllElements")
 end