Fix validations using defaults