Fix warnings.
Merge pull request #1054 from comex/i-hate-warnings

Fix warnings.