Fixed default repair for some contraints