Final fixes to Oauth Flow