Code violation fixes