more crash fixes