Some changes for iOS8