Index: source/ariba/overlay/messages/DHTMessage.cpp
===================================================================
--- source/ariba/overlay/messages/DHTMessage.cpp	(revision 6835)
+++ source/ariba/overlay/messages/DHTMessage.cpp	(revision 6919)
@@ -10,5 +10,5 @@
 DHTMessage::DHTMessage() {
 	this->key.setLength(0);
-	this->ttl =0 ;
+	this->ttl = 0;
 	this->replace = false;
 }
@@ -18,5 +18,5 @@
 	this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
 	this->key = key.clone();
-	this->ttl =0 ;
+	this->ttl = 0;
 	this->replace = false;
 }
@@ -26,13 +26,15 @@
 	this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
 	this->key = key.clone();
-	this->values.push_back(  value.clone() );
-	this->ttl =0 ;
+	this->values.push_back( value.clone() );
+	this->ttl = 0;
 	this->replace = false;
 }
 
 DHTMessage::DHTMessage( const Data& key, const vector<Data>& values ) {
+	this->hash = NodeID::sha1( key.getBuffer(), key.getLength() / 8 );
 	this->key = key.clone();
 	BOOST_FOREACH(const Data value, values )
-			this->values.push_back( value.clone() );
+		this->values.push_back( value.clone() );
+	this->ttl = 0;
 	this->replace = false;
 }
Index: source/ariba/overlay/messages/DHTMessage.h
===================================================================
--- source/ariba/overlay/messages/DHTMessage.h	(revision 6835)
+++ source/ariba/overlay/messages/DHTMessage.h	(revision 6919)
@@ -33,5 +33,5 @@
 
 	bool hasValues() const {
-		values.size() != 0;
+		return values.size() != 0;
 	}
 
Index: source/ariba/overlay/messages/OverlayMsg.h
===================================================================
--- source/ariba/overlay/messages/OverlayMsg.h	(revision 6835)
+++ source/ariba/overlay/messages/OverlayMsg.h	(revision 6919)
@@ -213,4 +213,5 @@
 	uint8_t increaseNumHops() {
 		hops++;
+		return hops;
 	}