Corrected some issues reported by GooglePlay Crashreports