More fixes to bring things inline with async recommendations, and fix for refreshing token due to changing to HttpClient.