diff --git a/modules/TargetCC.lua b/modules/TargetCC.lua
index 24c8eec..ce5b8f1 100644
--- a/modules/TargetCC.lua
+++ b/modules/TargetCC.lua
@@ -7,7 +7,7 @@ TargetCC.prototype.debuffRemaining = 0
 TargetCC.prototype.debuffDuration = 0
 
 local GetNumPartyMembers, GetNumRaidMembers = GetNumPartyMembers, GetNumRaidMembers
-if IceHUD.WowVer >= 50000 then
+if GetNumGroupMembers then
 	GetNumPartyMembers = GetNumGroupMembers
 	GetNumRaidMembers = GetNumGroupMembers
 end
diff --git a/modules/TargetInvuln.lua b/modules/TargetInvuln.lua
index eb406dc..8ca6953 100644
--- a/modules/TargetInvuln.lua
+++ b/modules/TargetInvuln.lua
@@ -7,7 +7,7 @@ TargetInvuln.prototype.buffRemaining = 0
 TargetInvuln.prototype.buffDuration = 0
 
 local GetNumPartyMembers, GetNumRaidMembers = GetNumPartyMembers, GetNumRaidMembers
-if IceHUD.WowVer >= 50000 then
+if GetNumGroupMembers then
 	GetNumPartyMembers = GetNumGroupMembers
 	GetNumRaidMembers = GetNumGroupMembers
 end
diff --git a/modules/TargetMana.lua b/modules/TargetMana.lua
index 998a50e..c39aac1 100644
--- a/modules/TargetMana.lua
+++ b/modules/TargetMana.lua
@@ -83,7 +83,7 @@ function IceTargetMana.prototype:Enable(core)
 			self:RegisterEvent("UNIT_FOCUS", "UpdateEvent")
 
 			-- DK rune stuff
-			if IceHUD.WowVer >= 30000 then
+			if SPELL_POWER_RUNIC_POWER then
 				self:RegisterEvent("UNIT_RUNIC_POWER", "UpdateEvent")
 				self:RegisterEvent("UNIT_MAXRUNIC_POWER", "UpdateEvent")
 			end
@@ -135,13 +135,13 @@ function IceTargetMana.prototype:Update(unit)
 			self.color = "TargetEnergy"
 		elseif (manaType == SPELL_POWER_RUNIC_POWER) then
 			self.color = "TargetRunicPower"
-		elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_INSANITY) then
+		elseif (manaType == SPELL_POWER_INSANITY) then
 			self.color = "TargetInsanity"
-		elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_FURY) then
+		elseif (manaType == SPELL_POWER_FURY) then
 			self.color = "TargetFury"
-		elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_MAELSTROM) then
+		elseif (manaType == SPELL_POWER_MAELSTROM) then
 			self.color = "TargetMaelstrom"
-		elseif (IceHUD.WowVer >= 70000 and manaType == SPELL_POWER_PAIN) then
+		elseif (manaType == SPELL_POWER_PAIN) then
 			self.color = "TargetPain"
 		end