some crashfixes from issue list