Fixed http client issues