Fixup more imports.