Fix more warnings.
Merge pull request #15 from zlangley/warnings

Fix more warnings.