x64-upstream: Adjust patches