Dealer fixes from Kitsuta

Here are (we hope) the last of the dealer fixes for the next few days.