Some focus fixes.