Fixed various breakage from the new id tracking
5 files changed