diff --git a/ElvUI/Core/Modules/DataTexts/DualSpec.lua b/ElvUI/Core/Modules/DataTexts/DualSpec.lua
index b6db210289..15bfc775ba 100644
--- a/ElvUI/Core/Modules/DataTexts/DualSpec.lua
+++ b/ElvUI/Core/Modules/DataTexts/DualSpec.lua
@@ -1,5 +1,5 @@
 local E, L, V, P, G = unpack(ElvUI)
-if not (E.Cata or E.ClassicSOD) then return end
+if not (E.Cata or E.ClassicSOD or E.ClassicAnniv or E.ClassicAnnivHC) then return end
 local DT = E:GetModule('DataTexts')
 
 local _G = _G
diff --git a/ElvUI_Options/Core/UnitFrames.lua b/ElvUI_Options/Core/UnitFrames.lua
index 93a6d3fba6..37bf09d8c5 100644
--- a/ElvUI_Options/Core/UnitFrames.lua
+++ b/ElvUI_Options/Core/UnitFrames.lua
@@ -927,7 +927,7 @@ local function GetOptionsTable_RaidIcon(updateFunc, groupName, numUnits, subGrou
 end
 
 local function GetOptionsTable_RoleIcons(updateFunc, groupName, numGroup)
-	local config = ACH:Group(L["Role Icon"], nil, nil, nil, function(info) return E.db.unitframe.units[groupName].roleIcon[info[#info]] end, function(info, value) E.db.unitframe.units[groupName].roleIcon[info[#info]] = value updateFunc(UF, groupName, numGroup) end, nil, E.Classic)
+	local config = ACH:Group(L["Role Icon"], nil, nil, nil, function(info) return E.db.unitframe.units[groupName].roleIcon[info[#info]] end, function(info, value) E.db.unitframe.units[groupName].roleIcon[info[#info]] = value updateFunc(UF, groupName, numGroup) end, nil, not E.allowRoles)
 	config.args.enable = ACH:Toggle(L["Enable"], nil, 0)
 	config.args.options = ACH:MultiSelect(' ', nil, 1, { tank = L["Show For Tanks"], healer = L["Show For Healers"], damager = L["Show For DPS"], combatHide = L["Hide In Combat"] }, nil, nil, function(_, key) return E.db.unitframe.units[groupName].roleIcon[key] end, function(_, key, value) E.db.unitframe.units[groupName].roleIcon[key] = value updateFunc(UF, groupName, numGroup) end)
 	config.args.position = ACH:Select(L["Position"], nil, 2, C.Values.AllPoints)