Add workaround for Xcode 6 issues.