minor fixes for iOS8