fix import bugs from refactoring