Coding Standard fixes