Fix more clang issues.
Merge pull request #3592 from ktf/fix-more-clang

Clang -- Fix more clang issues.