Fix id issues