further compilation fixes.
Merge branch 'db_transfer' of github.com:maidsafe/MaidSafe-Vault into db_transfer