export/import fix's