Fixed tabulation issues