Fix many crashlytics issues