More changes for the exporter.