updating for latest xcode and os x