Fix build errors and warnings
Merge pull request #1549 from bcrowe/3.0-build-errors

3.0 - Fix build errors and warnings