fix some focus issues