Fix a few issues related to export/import