Get rid of some build warnings.
Merge pull request #116 from xfxyjwf/fix_warnings

Get rid of some build warnings.