Minor IdentityManager changes to bring in-line with modified core.