Fixup patches against upstream