Support for Xcode 4.5

These are the changes I mentioned at the meetup tonight.