Fixed 2 known issues with the Import jobs