Minor fixups from the Marketplace