Some segfaults removed, hopufully :-o