Update our patches for changes from upstream