Xcode beta 3 fixes