Now compiles on OS X 10.8 / XCode 4.6