fixes to oauth2
more fixes..