Mostly coding standard fixes