Group fixes and Dealer reg rework