focus fixes for native targets