More clang fixes.
Merge pull request #3778 from ktf/fix-more-clang-issues

Clang -- Fixes for Reco.