Fix warnings
Merge pull request #1957 from linquize/warning3

Fix warnings