+ More XCode/compiler fixes