ToUpstream: misc