Updates for newer Xcode