More coding standard fixes