More minor updates to OAuth2 utils