Couple more minor warning fixes.
Merge pull request #996 from unknownbrackets/warnings

Fix some minor warnings