Bugfixes and improvements for coupon handling