Crash fixes from crashlytics reports.