Trade fields in Trade, some fixes