Fixup imports for future compatibility