- segfault fixes from svn