Fixed importation bugs