Fixes to import routine