Fix some warnings.
Merge pull request #1480 from RachelBryk/warn

Fix some warnings.