fix patches after upstream commit