some import fixes and other fixes