Changes to support older Xcode versions

Changes to support older versions of XCode (4.6 and below)