Make patch applicable

Make patch apply cleanly.