Fixed Validator Issues

- Fixed Validator Issues