Fix xml reports

For issue #75 (work in progress)