Trade fixes