Fix refactoring import glitches