Got rid of segfaults?