More focus related bug fixes.