Fix issues using inconsistent ui.focus and focus.