A bunch of small bug fixes for vouchers.