Additional attempts at reducing warnings without major refactors
Merge pull request #973 from krivera-pentaho/dev

Additional attempts at reducing warnings without major refactors