Changes according to Xcode Beta7