Fixed a few issues with tab focusing