Fixes Xcode 6 and iOS 8 build issues