Fixes for signin not completing on first click and async bug on snapshot resolution