Fixes to Dealer and Dealer Spec.