More bug fixing with iso20022 payment generation