Minor updates to OAuth2 encryption utils