fixes after PaymentInstructionAggregate\Aware changes.