A couple crash fixes
Merge branch 'development' into 1.8