Minor fix for import script
Minor fix for export script