Fixed a few tab focus issues