Fixup import paths