Customer Importing Fixes