Fixed even more segfaults :/