Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 4837)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 4838)
@@ -115,5 +115,4 @@
 	state = BaseOverlayStateJoinInitiated;
 
-
 	//
 	// start bootstrapping for spovnetid
Index: source/ariba/overlay/OverlayBootstrap.cpp
===================================================================
--- source/ariba/overlay/OverlayBootstrap.cpp	(revision 4837)
+++ source/ariba/overlay/OverlayBootstrap.cpp	(revision 4838)
@@ -50,10 +50,7 @@
 		nodeid( NodeID::UNSPECIFIED ),
 		overlay( NULL ){
-
-	manager.registerAllModules();
 }
 
 OverlayBootstrap::~OverlayBootstrap(){
-	manager.unregisterAllModules();
 }
 
@@ -64,4 +61,5 @@
 
 	manager.registerCallback( this );
+	manager.registerAllModules();
 }
 void OverlayBootstrap::stop(){
@@ -71,4 +69,5 @@
 
 	manager.unregisterCallback( this );
+	manager.unregisterAllModules();
 }
 
@@ -89,9 +88,11 @@
 	//
 
+	// announcement for another spovnet
 	if( sid != spovnetid )
 		return;
 
-	logging_info( "found bootstrap node for our SpoVNetID" << sid.toString()
-			<< " on NodeID " << nid << " and endpoint " << ep.toString() );
+	// announcement for our spovnet
+	logging_info( "found bootstrap node for our SpoVNetID " << sid.toString()
+			<< " on NodeID " << nid << " with endpoint " << ep.toString() );
 }
 
Index: source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp
===================================================================
--- source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp	(revision 4837)
+++ source/ariba/utility/bootstrap/modules/multicastdns/MulticastDns.cpp	(revision 4838)
@@ -396,8 +396,4 @@
 		case AVAHI_RESOLVER_FOUND:
 
-			char addr[AVAHI_ADDRESS_STR_MAX];
-
-			avahi_address_snprint(addr, sizeof(addr), address);
-
 			string info1 = "";
 			string info2 = "";
@@ -405,19 +401,19 @@
 
 			if(txt != NULL){
-				char* cinfo = avahi_string_list_to_string(txt);
-				info1 = cinfo;
-				avahi_free(cinfo);
+				char* cinfo = (char*)avahi_string_list_get_text(txt);
+				info1 = string(cinfo);
+				txt = avahi_string_list_get_next(txt);
 			}
 
-			if(txt != NULL && avahi_string_list_get_next(txt) != NULL){
-				char* cinfo = avahi_string_list_to_string( avahi_string_list_get_next(txt) );
-				info2 = cinfo;
-				avahi_free(cinfo);
+			if(txt != NULL){
+				char* cinfo = (char*)avahi_string_list_get_text(txt);
+				info2 = string(cinfo);
+				txt = avahi_string_list_get_next(txt);
 			}
 
-			if(txt != NULL && avahi_string_list_get_next(txt) != NULL){
-				char* cinfo = avahi_string_list_to_string( avahi_string_list_get_next(txt) );
-				info3 = cinfo;
-				avahi_free(cinfo);
+			if(txt != NULL){
+				char* cinfo = (char*)avahi_string_list_get_text(txt);
+				info3 = string(cinfo);
+				txt = avahi_string_list_get_next(txt);
 			}