some crash fixes