More tabbing fixes