Bug Fixes for iOS 8