Fix OAuth2 issues.