Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 6854)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 6919)
@@ -79,5 +79,5 @@
 
 	// check if we already have a connection
-	for (int i=0; i<table->size(); i++)
+	for (size_t i=0; i<table->size(); i++)
 		if ((*table)[i]->ref_count > 0 && (*table)[i]->id == remote && !((*table)[i]->info.isUnspecified()))
 			return LinkID::UNSPECIFIED;
@@ -291,5 +291,5 @@
 
 	// handle messages
-	switch (m->getType()) {
+	switch ((signalMessageTypes)m->getType()) {
 
 	// discovery request
@@ -317,5 +317,5 @@
 			setup( dmsg->getEndpoint(), m->getSourceNode() );
 
-		// delegate discovery message
+		// process discovery message -------------------------- switch start --
 		switch (dmsg->getType()) {
 
@@ -388,5 +388,13 @@
 			baseoverlay.send(&omsg, omsg.getDestinationNode());
 			break;
-		}}
+		}
+		case Discovery::invalid:
+			break;
+
+		default:
+			break;
+		}
+		// process discovery message ---------------------------- switch end --
+
 		delete dmsg;
 		break;
@@ -426,5 +434,5 @@
 		// updating neighbors
 		logging_debug("Discover new ring neighbors");
-		for (int i=0; i<table->size(); i++) {
+		for (size_t i=0; i<table->size(); i++) {
 			LinkID id = (*table)[i]->info;
 			if (!id.isUnspecified()) discover_neighbors(id);
Index: source/ariba/overlay/modules/chord/detail/chord_routing_table.hpp
===================================================================
--- source/ariba/overlay/modules/chord/detail/chord_routing_table.hpp	(revision 6854)
+++ source/ariba/overlay/modules/chord/detail/chord_routing_table.hpp	(revision 6919)
@@ -92,5 +92,5 @@
 private:
 	// maximum number of fingers
-	static const int max_fingers = 32;
+	static const size_t max_fingers = 32;
 
 	// the own node id