@@ -1759,7 +1759,7 @@ function Blizzard_CombatLog_SpellMenuCl
 			v.eventList[eventType] = false;
 		end
 	elseif ( action == "LINK" ) then
-		if ( ChatFrameEditBox:IsVisible() ) then
+		if ( ChatEdit_GetActiveWindow() ) then
 			ChatEdit_InsertLink(GetSpellLink(spellId));
 		else
 			ChatFrame_OpenChat(GetSpellLink(spellId));
@@ -3432,10 +3432,6 @@ end
 -- BUG: Since we're futzing with the frame height, the combat log tab fades out on hover while other tabs remain faded in. This bug is in the stock version, as well.
 
 local function Blizzard_CombatLog_AdjustCombatLogHeight()
-	if ( SIMPLE_CHAT == "1" ) then
-		return;
-	end
-
 	-- This prevents improper positioning of the frame due to the scale not yet being set.
 	-- This whole method of resizing the frame and extending the background to preserve visual continuity really screws with repositioning after
 	-- a reload. I'm not sure it's going to work well in the long run.
@@ -3499,6 +3495,8 @@ function Blizzard_CombatLog_QuickButton
 		COMBATLOG:UnregisterEvent("COMBAT_LOG_EVENT");
 		return hide and hide(self)
 	end)	
+	
+	FCF_SetButtonSide(COMBATLOG, COMBATLOG.buttonSide, true);
 end
 
 local oldFCF_DockUpdate = FCF_DockUpdate;
@@ -3559,7 +3557,7 @@ end
 -- Players may also get all sorts of errors on trying to click on these new linktypes before
 -- Blizzard_CombatLog gets loaded.
 local oldSetItemRef = SetItemRef;
-function SetItemRef(link, text, button)
+function SetItemRef(link, text, button, chatFrame)
 
 	if ( strsub(link, 1, 4) == "unit") then
 		local _, guid, name = strsplit(":", link);
@@ -3615,7 +3613,7 @@ function SetItemRef(link, text, button)
 			return;
 		end
 	end
-	oldSetItemRef(link, text, button);
+	oldSetItemRef(link, text, button, chatFrame);
 end
 
 function Blizzard_CombatLog_Update_QuickButtons()