Fixed remaining issues around sign in with Google