Fixes validations