more cdsso and oidc fixes