Fix compiler warnings
Merge pull request #471 from Metaswitch/warnings

[No reviewer] Fix compiler warnings