(OSX) Xcode 3.2 build fixes