Some Crash fixes