Fixes to Trading