Silence a number of compiler warnings.
Merge pull request #1783 from vohi/compiler_warnings

Silence a number of compiler warnings.
Merge pull request #1774 from jimis/cfupgrade

Simple doc, Makefile, and cherry-pick error fixes.