Fixes for IDENTITY-2821