fixes on alignment to oauth2