Make sure old IDs are fixed up