Fix build errors with Xcode 6.1 GM