diff --git a/core/parser.lua b/core/parser.lua
index 06fb71dff..8357ce938 100755
--- a/core/parser.lua
+++ b/core/parser.lua
@@ -5944,6 +5944,9 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 			Details222.MythicPlus.WorldStateTimerStartAt = nil
 			Details222.MythicPlus.WorldStateTimerEndAt = nil
 			Details222.MythicPlus.LogStep("Event: CHALLENGE_MODE_START")
+
+			local activeKeystoneLevel, activeAffixIDs, wasActiveKeystoneCharged = C_ChallengeMode.GetActiveKeystoneInfo()
+			Details222.MythicPlus.Level = activeKeystoneLevel or 2
 		end
 	end
 
diff --git a/functions/mythicdungeon/segments.lua b/functions/mythicdungeon/segments.lua
index 7360715e3..9f132fb2d 100644
--- a/functions/mythicdungeon/segments.lua
+++ b/functions/mythicdungeon/segments.lua
@@ -280,7 +280,7 @@ function DetailsMythicPlusFrame.MergeSegmentsOnEnd() --~merge
 		DungeonTexture = Details222.MythicPlus.Texture,
 		DungeonBackgroundTexture = Details222.MythicPlus.BackgroundTexture,
         SegmentType = DETAILS_SEGMENTTYPE_MYTHICDUNGEON_OVERALL,
-        SegmentName = Details.MythicPlus.DungeonName .. " +" .. Details222.MythicPlus.Level,
+        SegmentName = Details.MythicPlus.DungeonName .. " +" .. (Details222.MythicPlus.Level or 2),
     }
 
     --add all boss segments from this run to this new segment
diff --git a/luaserver.lua b/luaserver.lua
index 615c92af3..b3d4f09ac 100644
--- a/luaserver.lua
+++ b/luaserver.lua
@@ -467,6 +467,9 @@ BackdropTemplateMixin = {}
 ---@field GetPoint fun(self: uiobject, index: number): string, frame, string, number, number
 ---@field GetCenter fun(self: uiobject): number, number
 ---@field GetLeft fun(self: uiobject): number
+---@field GetRight fun(self: uiobject): number
+---@field GetTop fun(self: uiobject): number
+---@field GetBottom fun(self: uiobject): number
 ---@field SetPoint fun(self: uiobject, point: anchorpoint, relativeFrame: uiobject, relativePoint: anchorpoint, xOffset: number, yOffset: number)
 ---@field ClearAllPoints fun(self: uiobject)
 ---@field CreateAnimationGroup fun(self: uiobject, name: string|nil, templateName: string|nil) : animationgroup