Finish fix-multi-identities