Some coding standard fixes from b80442d