Fixup for upstream changes