Fix patches after upstream commit