MNT: Fixed import issues