Fixed Remaining Violations

See individual commits for details