(Hopefully) Fix remaining segfaults