Fixed Validator Errors