Fix uniqueness constraints, file validations...