diff --git a/KkthnxUI/Init.lua b/KkthnxUI/Init.lua
index 121fba34..9c660c38 100644
--- a/KkthnxUI/Init.lua
+++ b/KkthnxUI/Init.lua
@@ -48,18 +48,18 @@ Engine[3] = {} -- L, Locale
 local K, C, L = Engine[1], Engine[2], Engine[3]
 
 -- Lib Info
-K.LibEasyMenu = LibStub("LibEasyMenu-1.0")
-K.LibBase64 = LibStub("LibBase64-1.0-KkthnxUI")
-K.LibActionButton = LibStub("LibActionButton-1.0-KkthnxUI")
-K.LibChangeLog = LibStub("LibChangelog-KkthnxUI")
-K.LibDeflate = LibStub("LibDeflate-KkthnxUI")
-K.LibSharedMedia = LibStub("LibSharedMedia-3.0")
-K.LibRangeCheck = LibStub("LibRangeCheck-3.0-KkthnxUI")
-K.LibSerialize = LibStub("LibSerialize-KkthnxUI")
-K.LibCustomGlow = LibStub("LibCustomGlow-1.0-KkthnxUI", true)
-K.LibUnfit = LibStub("Unfit-1.0-KkthnxUI")
-K.cargBags = Engine.cargBags
-K.oUF = Engine.oUF
+K.LibEasyMenu = LibStub("LibEasyMenu-1.0", true) or nil
+K.LibBase64 = LibStub("LibBase64-1.0-KkthnxUI", true) or nil
+K.LibActionButton = LibStub("LibActionButton-1.0-KkthnxUI", true) or nil
+K.LibChangeLog = LibStub("LibChangelog-KkthnxUI", true) or nil
+K.LibDeflate = LibStub("LibDeflate-KkthnxUI", true) or nil
+K.LibSharedMedia = LibStub("LibSharedMedia-3.0", true) or nil
+K.LibRangeCheck = LibStub("LibRangeCheck-3.0-KkthnxUI", true) or nil
+K.LibSerialize = LibStub("LibSerialize-KkthnxUI", true) or nil
+K.LibCustomGlow = LibStub("LibCustomGlow-1.0-KkthnxUI", true) or nil
+K.LibUnfit = LibStub("Unfit-1.0-KkthnxUI", true) or nil
+K.cargBags = Engine and Engine.cargBags or nil
+K.oUF = Engine and Engine.oUF or nil
 
 -- AddOn Info
 K.Title = C_AddOns_GetAddOnMetadata(AddOnName, "Title")
diff --git a/KkthnxUI/Modules/Announcements/Elements/Interrupt.lua b/KkthnxUI/Modules/Announcements/Elements/Interrupt.lua
index 5ab333b9..2f18b1ec 100644
--- a/KkthnxUI/Modules/Announcements/Elements/Interrupt.lua
+++ b/KkthnxUI/Modules/Announcements/Elements/Interrupt.lua
@@ -121,7 +121,7 @@ function Module:InterruptAlert_Update(...)
 end
 
 function Module:InterruptAlert_CheckGroup()
-	if IsInGroup() and (not C["Announcements"].InstAlertOnly or (IsInInstance() and not IsRandomGroup())) then
+	if IsInGroup() and (not C["Announcements"].InstAlertOnly or (IsInInstance() and not IsPartyLFG() or C_PartyInfo.IsPartyWalkIn())) then
 		K:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED", Module.InterruptAlert_Update)
 	else
 		K:UnregisterEvent("COMBAT_LOG_EVENT_UNFILTERED", Module.InterruptAlert_Update)
diff --git a/KkthnxUI/Modules/Tooltip/Core.lua b/KkthnxUI/Modules/Tooltip/Core.lua
index 09c5364f..571ebef6 100644
--- a/KkthnxUI/Modules/Tooltip/Core.lua
+++ b/KkthnxUI/Modules/Tooltip/Core.lua
@@ -408,14 +408,14 @@ function Module:ReskinTooltip()
 	if self:IsForbidden() then
 		return
 	end
-	self:SetScale(1)
 
 	if not self.tipStyled then
 		self:HideBackdrop()
 		self:DisableDrawLayer("BACKGROUND")
 		self.bg = CreateFrame("Frame", nil, self)
-		self.bg:SetPoint("TOPLEFT", self, 2, -2)
-		self.bg:SetPoint("BOTTOMRIGHT", self, -2, 2)
+		self.bg:ClearAllPoints()
+		self.bg:SetPoint("TOPLEFT", self, "TOPLEFT", 2, -2)
+		self.bg:SetPoint("BOTTOMRIGHT", self, "BOTTOMRIGHT", -2, 2)
 		self.bg:SetFrameLevel(self:GetFrameLevel())
 		self.bg:CreateBorder()
 
diff --git a/KkthnxUI/Modules/UnitFrames/Units/Nameplates.lua b/KkthnxUI/Modules/UnitFrames/Units/Nameplates.lua
index 3ed8ab24..5adc3769 100644
--- a/KkthnxUI/Modules/UnitFrames/Units/Nameplates.lua
+++ b/KkthnxUI/Modules/UnitFrames/Units/Nameplates.lua
@@ -591,9 +591,15 @@ function Module:UpdateClassIcon(self, unit)
 	local reaction = UnitReaction(unit, "player")
 	if UnitIsPlayer(unit) and (reaction and reaction <= 4) then
 		local _, class = UnitClass(unit)
-		local texcoord = CLASS_ICON_TCOORDS[class]
-		self.Class.Icon:SetTexCoord(texcoord[1] + 0.015, texcoord[2] - 0.02, texcoord[3] + 0.018, texcoord[4] - 0.02)
-		self.Class:Show()
+
+		if class and CLASS_ICON_TCOORDS[class] then
+			local texcoord = CLASS_ICON_TCOORDS[class]
+			self.Class.Icon:SetTexCoord(texcoord[1] + 0.015, texcoord[2] - 0.02, texcoord[3] + 0.018, texcoord[4] - 0.02)
+			self.Class:Show()
+		else
+			self.Class.Icon:SetTexCoord(0, 0, 0, 0)
+			self.Class:Hide()
+		end
 	else
 		self.Class.Icon:SetTexCoord(0, 0, 0, 0)
 		self.Class:Hide()