Few iOS 8 fixes
iOS 8 bug fixes