Fix importing bugs