Fixed segfaults?