Change Validator to interface, misc fixes