Marketplace tweaks.

Got accepted, but figured out AD issue.  Resubmitted.