important crash fixes