Fixes build issues with Xcode 6.1.1