SSO fixes