Fix issues on importations