Minor mods to make it buildable on Xcode 4.5.2/SDK6.0/armv7/v8.32