Import Fixes

Fixing issues with the import process.