Update for latest Xcode and ApacheCon