Fix compile errors with http-conduit changes (2.0.0.4)