Changes to accommodate XCode build