Import process fixes