Minor Validator Fixes