Fixed Violations

See the individual commits for details.