Fix build warnings
Merge pull request #380 from Metaswitch/build_errors

[No reviewer] Fix build warnings