Fix conditional validations