Validator changes and misc cleanup