Fix trade_MP and cancel support