Fix a few exporter bugs