15-prevent-leaks-and-segfault.diff did not apply cleanly with quilt. After fixing this, some of the other patches needed a refresh.