Tweak the client to get Content-length passed when needed