Tweak response body handling