Fix a build fail on some environment.
13 files changed