More trade screen fixes