Fix more validations