Fix Xcode 6 Beta 4 issues.