Henrik Reitan
Even more possible crash fixes