Changes required to support iOS 8