Updated for XCode6 compat