Coding standard related fixes