Fix build warnings.
Merge branch 'feature/buildWarnings'