(iOS) more changes to ensure that we can build in XCode 4+.