TRIVIAL changes to make build work on xcode 5