Fix specs and restore support for current versions of Xcode