Update patches so this builds.
Remove patch for non-existing file.