Slight fixes, trailing commas, etc.