* Added some crashfixes