diff --git a/modules/RangeCheck.lua b/modules/RangeCheck.lua
index 9cd8f04..82ed8c6 100644
--- a/modules/RangeCheck.lua
+++ b/modules/RangeCheck.lua
@@ -122,7 +122,7 @@ end
 
 function RangeCheck.prototype:CreateFrame(redraw)
 	if not (self.frame) then
-		self.frame = CreateFrame("Frame", "IceHUD_"..self.elementName, self.masterFrame)
+		self.frame = CreateFrame("Frame", "IceHUD_"..self.elementName, self.parent)
 	end
 
 	self.frame:SetScale(self.moduleSettings.scale)
@@ -132,7 +132,7 @@ function RangeCheck.prototype:CreateFrame(redraw)
 	self.frame:ClearAllPoints()
 	self.frame:SetPoint("TOP", self.parent, "TOP", self.moduleSettings.hpos, self.moduleSettings.vpos)
 
-	self.frame.rangeFontString = self:FontFactory(--[[self.moduleSettings.fontSize+1]] 13, nil, self.frame.rangeFontString)
+	self.frame.rangeFontString = self:FontFactory(--[[self.moduleSettings.fontSize+1]] 13, self.frame, self.frame.rangeFontString)
 	self.frame.rangeFontString:SetJustifyH("CENTER")
 	self.frame.rangeFontString:SetJustifyV("TOP")
 	self.frame.rangeFontString:SetAllPoints(self.frame)
diff --git a/modules/TargetInfo.lua b/modules/TargetInfo.lua
index 6f4df31..1f566c3 100644
--- a/modules/TargetInfo.lua
+++ b/modules/TargetInfo.lua
@@ -776,7 +776,7 @@ end
 -- OVERRIDE
 function IceTargetInfo.prototype:CreateFrame(redraw)
 	if not (self.frame) then
-		self.frame = CreateFrame("Button", "IceHUD_"..self.elementName, self.masterFrame, "SecureUnitButtonTemplate")
+		self.frame = CreateFrame("Button", "IceHUD_"..self.elementName, self.parent, "SecureUnitButtonTemplate")
 	end
 
 	-- Parnic - yes, 200 is fairly arbitrary. make a best effort for long names to fit
@@ -845,7 +845,7 @@ end
 
 
 function IceTargetInfo.prototype:CreateTextFrame()
-	self.frame.targetName = self:FontFactory(self.moduleSettings.fontSize+1, nil, self.frame.targetName)
+	self.frame.targetName = self:FontFactory(self.moduleSettings.fontSize+1, self.frame, self.frame.targetName)
 
 	self.frame.targetName:SetJustifyH("CENTER")
 	self.frame.targetName:SetJustifyV("TOP")
@@ -855,7 +855,7 @@ end
 
 
 function IceTargetInfo.prototype:CreateInfoTextFrame()
-	self.frame.targetInfo = self:FontFactory(self.moduleSettings.fontSize, nil, self.frame.targetInfo)
+	self.frame.targetInfo = self:FontFactory(self.moduleSettings.fontSize, self.frame, self.frame.targetInfo)
 
 --	self.frame.targetInfo:SetWidth(self.width)
 	self.frame.targetInfo:SetHeight(14)
@@ -868,7 +868,7 @@ end
 
 
 function IceTargetInfo.prototype:CreateGuildTextFrame()
-	self.frame.targetGuild = self:FontFactory(self.moduleSettings.fontSize, nil, self.frame.targetGuild)
+	self.frame.targetGuild = self:FontFactory(self.moduleSettings.fontSize, self.frame, self.frame.targetGuild)
 
 --	self.frame.targetInfo:SetWidth(self.width)
 	self.frame.targetGuild:SetHeight(14)
@@ -881,7 +881,7 @@ end
 
 
 function IceTargetInfo.prototype:CreateExtraTextFrame()
-	self.frame.targetExtra = self:FontFactory(self.moduleSettings.fontSize, nil, self.frame.targetExtra)
+	self.frame.targetExtra = self:FontFactory(self.moduleSettings.fontSize, self.frame, self.frame.targetExtra)
 
 	self.frame.targetExtra:SetHeight(14)
 	self.frame.targetExtra:SetJustifyH("CENTER")
diff --git a/modules/TargetOfTarget.lua b/modules/TargetOfTarget.lua
index c194393..ee34c89 100644
--- a/modules/TargetOfTarget.lua
+++ b/modules/TargetOfTarget.lua
@@ -289,7 +289,7 @@ end
 -- OVERRIDE
 function TargetOfTarget.prototype:CreateFrame()
 	if not self.frame then
-		self.frame = CreateFrame("Button", "IceHUD_"..self.elementName, self.masterFrame, "SecureUnitButtonTemplate")
+		self.frame = CreateFrame("Button", "IceHUD_"..self.elementName, self.parent, "SecureUnitButtonTemplate")
 		self.frame:SetAttribute("unit", self.unit)
 	end