Fixed build issues on Xcode 6.1 for Mac targets