Changes to make XCode happy