Changes to build in XCode6