Fixing up ids.