Fix xcode issues