Possible crash fixes