misc imports fixes