Minor changes for newer Xcode IDE