Fixed Even More Violations

See individual commits for details.