Fix some segfaults