Some tab fixes