Adding more needed changes for crashlytics