Misc changes in Xcode project