Offer handling fixes.