fix some warning
Merge pull request #2380 from vipulnsward/fix_warnings

fix some warnings