Fixes for identity API changes