Fix for Xcode 6.1 language/API changes