Coding standard violation fixes.