Minor import/export changes to support new export model