more focus fixes