Xcode 6.1 fixes