Attempt to fix patches after upstream commits