Xcode 4.6 build fixes