Trade fixes

Forwarding missed changes upstream