Fixed more crashes.