Macdate 18

Various internal xcode changes