Fixed #17 and #18 on Crashlytics