exporter fixes