fix up id's