Working on fixing SAML problems