Fixed build issues with Xcode 6.1