Fix de-jure assignments.