Fix clang6 failures.
3 files changed