Fixed More Violations

See the individual commits for details