fixes for iOS8