more import fixes and warning fixes