Correct bugs on exporter