Fix some minor warnings.
Fix a minor typo.
Merge pull request #5596 from unknownbrackets/warnings

Fix some minor warnings