Fixup ID handling