More crash fixes.