Correct id references