2.0.2.2 Progress Pt. 7

- Minor Validator fixes