Fix references to old-style IDs