Fix two more id clashes