Shibboleth tweaks