Fix patches that were too specific