Improve upstreams code.