Considering Trader errata

Considering Trader errata