Fix some import issues