Fixes to the export of results