Fixing some focus issues