Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 5406)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 5412)
@@ -60,7 +60,4 @@
 namespace overlay {
 
-#define logging_force(x) std::cout << x << std::endl;
-#define logging_force1(x) std::cout << x << std::endl;
-
 LinkDescriptor* BaseOverlay::getDescriptor( const LinkID& link, bool communication ) {
 	BOOST_FOREACH( LinkDescriptor* lp, links )
@@ -127,5 +124,5 @@
 		// get descriptor of first hop
 		rld = getDescriptor(rlid);
-		logging_force1( rld );
+		logging_force( rld );
 
 		// is first hop a relay path? yes-> try to find real link!
@@ -136,10 +133,10 @@
 		else relayNode = rld->remoteNode;
 	}
-	logging_force1( "Potential relay node " << relayNode.toString() );
+	logging_force( "Potential relay node " << relayNode.toString() );
 	// do not return myself or use the node as relay node
 	if (relayNode == nodeId)
 		return NodeID::UNSPECIFIED;
 	else {
-		logging_force1( "Returning relay node " << relayNode.toString() );
+		logging_force( "Returning relay node " << relayNode.toString() );
 		return relayNode;
 	}
@@ -310,5 +307,5 @@
 			" with nodeid " << nodeId.toString());
 
-	if(bootstrapEp == EndpointDescriptor::UNSPECIFIED && state == BaseOverlayStateInvalid){
+	if(bootstrapEp.isUnspecified() && state == BaseOverlayStateInvalid){
 
 		// bootstrap against ourselfs
Index: source/ariba/overlay/OverlayBootstrap.cpp
===================================================================
--- source/ariba/overlay/OverlayBootstrap.cpp	(revision 5406)
+++ source/ariba/overlay/OverlayBootstrap.cpp	(revision 5412)
@@ -65,5 +65,5 @@
 	manager.registerCallback( this );
 	manager.registerModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-	//manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+	manager.registerModule( BootstrapManager::BootstrapTypeBluetoothSdp );
 }
 
@@ -77,5 +77,5 @@
 	manager.unregisterCallback( this );
 	manager.unregisterModule( BootstrapManager::BootstrapTypePeriodicBroadcast );
-	//manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
+	manager.unregisterModule( BootstrapManager::BootstrapTypeBluetoothSdp );
 }