Corrected some violations.