Fix some validations being ignored