More coding standard corrections.