Fixed tabbing in some places