marketplace: marketplace A fixes