Fix id confusions.