Fix dealer registration

Applies a new round of fixes to finalize dealer registration for AC.
I dunno if you're still running the unit tests, but this will definitely make them fail.