Fixed crashes.