more bugfixes for trader bugs