more httpclient4 fixes