some import fixes after refactoring