Warning cleanup
Merge pull request #204 from apaiva/warning_fixes

Warning cleanup