Xcode beta 6 fixes