more crash fixes.