Error fixes related to Buyer, Part 1