Crash fixes
Merge branch 'crashfixes'