Fix two small issues and Xcode config