Fix some store defaults being incorrectly set in identity.