More changes to get the export to work.