fixes to export / import