Other coding standard fixes