Tweaks and fixes for attributs and more SAML data