minor fixes
import fixes