More validations fixes