Voucher redeem fixes

Have a look at the commit messages to see what I have changed. Thanks, Ben