Fixed import glitches