Fixed some warnings
Merge pull request #788 from worktycho/warnings

Fixed some warnings