Changes to build on Xcode 5 without warnings