fix-test-failures.diff
fix-segfault.diff
