Minor updates to OAuth2 service in 3.0.x