Violations fixed