Fix clang warnings.
Fix clang warning.
Merge pull request #5251 from alja/clang-warnings-99

Fix clang warnings