Validations Fixes