Fixing compiler issues in Xcode 6