Fix compiler warnings.
Merge pull request #1 from gburd/master

Fix compiler warnings.