Fix problems with http-conduit >= 2