Add validation for against_voucher_type and minor fixes