Default locale and trailing commas fixed