Tweaks for handling thread safe http client calls