 * Adding some crashfixes
