fix some importing issues