focus fixes