A bit of coding standard fixes