further fixes to import/export roundtrip