Xcode scheme fixes