Fixes for httpclient