Upgrade broker to set content length