fix patches after upstream commits