Fix problem where Client did not set headers.