More tab fixes.