A few minor changes to keep consistency.