diff --git a/ElvUI/Mainline/Modules/Skins/AddonManager.lua b/ElvUI/Mainline/Modules/Skins/AddonManager.lua
index 808902df7c..f20c1c03f7 100644
--- a/ElvUI/Mainline/Modules/Skins/AddonManager.lua
+++ b/ElvUI/Mainline/Modules/Skins/AddonManager.lua
@@ -7,7 +7,10 @@ local hooksecurefunc = hooksecurefunc
 
 local GetAddOnInfo = C_AddOns.GetAddOnInfo
 
-local function HandleButton(entry, addonIndex)
+local function HandleButton(entry, treeNode)
+	local addonIndex = treeNode:GetData().addonIndex
+	local name, title, notes, _, _, security = GetAddOnInfo(addonIndex)
+
 	if not entry.IsSkinned then
 		S:HandleCheckBox(entry.Enabled)
 		S:HandleButton(entry.LoadAddonButton)
@@ -53,10 +56,10 @@ function S:AddonList()
 	S:HandleButton(AddonList.CancelButton, nil, nil, nil, true, nil, nil, nil, true)
 	S:HandleDropDownBox(_G.AddonList.Dropdown, 165)
 	S:HandleTrimScrollBar(_G.AddonList.ScrollBar)
-	S:HandleCheckBox(_G.AddonListForceLoad)
-	_G.AddonListForceLoad:Size(26)
+	S:HandleCheckBox(_G.AddonList.ForceLoad)
+	_G.AddonList.ForceLoad:Size(26)
 
-	hooksecurefunc('AddonList_InitButton', HandleButton)
+	hooksecurefunc('AddonList_InitAddon', HandleButton)
 end
 
 S:AddCallback('AddonList')
diff --git a/ElvUI/Mainline/Modules/Skins/WorldMap.lua b/ElvUI/Mainline/Modules/Skins/WorldMap.lua
index cbf0c2be20..1ec48f3466 100644
--- a/ElvUI/Mainline/Modules/Skins/WorldMap.lua
+++ b/ElvUI/Mainline/Modules/Skins/WorldMap.lua
@@ -187,10 +187,6 @@ function S:WorldMapFrame()
 	QuestScrollBar:Point('TOPLEFT', _G.QuestDetailFrame, 'TOPRIGHT', 4, -15)
 	QuestScrollBar:Point('BOTTOMLEFT', _G.QuestDetailFrame, 'BOTTOMRIGHT', 9, 10)
 
-	local CampaignOverview = QuestMapFrame.CampaignOverview
-	SkinHeaders(CampaignOverview.Header)
-	CampaignOverview.BorderFrame.Border:SetAlpha(0)
-
 	if E.private.skins.blizzard.tooltip then
 		TT:SetStyle(QuestMapFrame.QuestsFrame.StoryTooltip)
 	end
@@ -261,6 +257,9 @@ function S:WorldMapFrame()
 	MapLegendScroll:StripTextures()
 	MapLegendScroll:SetTemplate()
 	S:HandleTrimScrollBar(MapLegendScroll.ScrollBar)
+
+	-- 11.1 Stuff
+
 end
 
 S:AddCallback('WorldMapFrame')
diff --git a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua
index 26b6ead54d..63107b2444 100644
--- a/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua
+++ b/ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua
@@ -2558,7 +2558,6 @@ if ActionButton_UpdateFlyout then
 	end
 else
 	function UpdateFlyout(self, isButtonDownOverride)
-		self.FlyoutBorderShadow:Hide()
 		if self._state_type == "action" then
 			-- based on ActionButton_UpdateFlyout in ActionButton.lua
 			local actionType = GetActionInfo(self._state_action)
@@ -2618,8 +2617,6 @@ else
 				return
 			end
 		end
-
-		self.FlyoutArrowContainer:Hide()
 	end
 end
 Generic.UpdateFlyout = UpdateFlyout