Index: /source/ariba/SideportListener.cpp
===================================================================
--- /source/ariba/SideportListener.cpp	(revision 5435)
+++ /source/ariba/SideportListener.cpp	(revision 5436)
@@ -79,5 +79,6 @@
 	if( overlay == NULL ) return nodes;
 
-	overlay->getOverlayNeighbors(deep);
+	nodes = overlay->getOverlayNeighbors(deep);
+	return nodes;
 }
 
Index: /source/ariba/SideportListener.h
===================================================================
--- /source/ariba/SideportListener.h	(revision 5435)
+++ /source/ariba/SideportListener.h	(revision 5436)
@@ -42,8 +42,10 @@
 #include <vector>
 #include <map>
+#include <iostream>
 #include <boost/foreach.hpp>
 #include "Identifiers.h"
 #include "CommunicationListener.h"
 
+using std::cout;
 using std::map;
 using std::vector;
Index: /source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- /source/ariba/overlay/BaseOverlay.cpp	(revision 5435)
+++ /source/ariba/overlay/BaseOverlay.cpp	(revision 5436)
@@ -1448,6 +1448,8 @@
 	// the known nodes _can_ also include our node, so we remove ourself
 	vector<NodeID> nodes = overlayInterface->getKnownNodes(deep);
+
 	vector<NodeID>::iterator i = find( nodes.begin(), nodes.end(), this->nodeId );
 	if( i != nodes.end() ) nodes.erase( i );
+
 	return nodes;
 }
Index: /source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- /source/ariba/overlay/modules/chord/Chord.cpp	(revision 5435)
+++ /source/ariba/overlay/modules/chord/Chord.cpp	(revision 5436)
@@ -189,5 +189,5 @@
 			nodelist.push_back( *(table->get_predesessor()) );
 		}
-		
+
 		if( table->get_successor() != NULL ){
 			nodelist.push_back( *(table->get_successor()) );