Gift and coupon fix