Bug fixes for iso20022 reported by Sebastian