Fixed more crash bugs.