Fixing Validator Errors