Last changes and fixes for vouchers...