Fix issues caused by the last commit on the import commands