Fixed issues with building in Xcode 6.0.1