Fixing OAuth2 package to work with recent Argo changes.