Fix content-type and -encoding regression