Fixed other violations...