Build error fixes (Xcode Beta2 -> XCode Beta4)