Fixes for SSO state snapshotting