fixup upstream import errors