crash fixes