Fixes to focus thanks to @sherakama