Add Xcode 6 compatibility