Fixed tab cleanups