General validations fixed