Minor fixes

Some little issues were causing unnecessarily problems and crashlytics spam.