some crash fixes (nw)