Change for Xcode 6 build