some more crash fixes