oauth_generator fixes