Some fixes required for Saml Profile2