DSA-37/DSA-38: Fix numerous OIDC bugs