Some coding standard fixes