Couple more crash fixes.