Coding violation fixes