Resolved many issues with import/export routines