More fixes to T_TRADE. I think I can start fixing the calls now.