marketplace: marketplace-a fixes