More violation fixes.