more tab fixes