Fix up some of the bugs in the new sell through support system