Bug/Crashfixes.