More Fixes to Import Routines