Fixing critical violations.