Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 6824)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 6832)
@@ -509,5 +509,5 @@
 	if (destination == nodeId) {
 		logging_warn("Sent message to myself. Handling message.")
-				Message msg;
+		Message msg;
 		msg.encapsulate(message);
 		handleMessage( &msg, NULL );
@@ -819,5 +819,5 @@
 
 		// bootstrap against ourselfs
-		logging_debug("joining spovnet locally");
+		logging_info("joining spovnet locally");
 
 		overlayInterface->joinOverlay();
@@ -836,5 +836,5 @@
 
 		// bootstrap against another node
-		logging_debug("joining spovnet remotely against " << bootstrapEp.toString());
+		logging_info("joining spovnet remotely against " << bootstrapEp.toString());
 
 		const LinkID& lnk = bc->establishLink( bootstrapEp );
Index: source/ariba/overlay/OverlayBootstrap.cpp
===================================================================
--- source/ariba/overlay/OverlayBootstrap.cpp	(revision 6824)
+++ source/ariba/overlay/OverlayBootstrap.cpp	(revision 6832)
@@ -76,5 +76,5 @@
 	//manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
 	//manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
-	manager.registerModule( BootstrapManager::BootstrapTypeMulticastDns );
+	//manager.registerModule( BootstrapManager::BootstrapTypeMulticastDns );
 
 	watchtimer.startWatchdog();
@@ -91,5 +91,5 @@
 	//manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
 	//manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
-	manager.unregisterModule( BootstrapManager::BootstrapTypeMulticastDns );
+	//manager.unregisterModule( BootstrapManager::BootstrapTypeMulticastDns );
 
 	watchtimer.stopWatchdog();
Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 6824)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 6832)
@@ -251,5 +251,5 @@
 				<< " with link " << lnk.toString());
 		// replace with new link
-		if (!item->info.isUnspecified() || item->info!=lnk)
+		if (item->info!=lnk && item->info.isUnspecified()==false)
 			baseoverlay.dropLink(item->info);
 		item->info = lnk;