Fix some warnings
Merge pull request #733 from vipulnsward/warn-1

Fix some warnings