More tab fixes