Coding standard fixes