Adding some fixes for Dealer API v2