fixing build for latest Yosemite and Xcode updates