Fixed more crashes