Coding standard violation fixes