Fix compiler warnings.
Merge pull request #18 from Metaswitch/compiler-warnings

[Reviewer: Matt] Fix compiler warnings.