Improvements to import/export op.