Various fixes for ControlPanel:AddControl