Coder violation fixes.