More tabs fixed