Further OAuth Tweaks