A few compiler warning fixes
Merge pull request #1447 from cedeel/patch-2

A few compiler warning fixes