Fix uniqueness issues