Fixes for iOS8