Index: source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp
===================================================================
--- source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 5973)
+++ source/ariba/utility/bootstrap/modules/bluetoothsdp/BluetoothSdp.cpp	(revision 6919)
@@ -64,4 +64,7 @@
 namespace utility {
 
+static bdaddr_t bd_addr_any = {{0, 0, 0, 0, 0, 0}};
+static bdaddr_t bd_addr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
+
 use_logging_cpp(BluetoothSdp);
 OverlayBootstrap* BluetoothSdp::CONNECTION_CHECKER = NULL;
@@ -216,5 +219,5 @@
 	// connect to the local SDP server, register the service record
 	if( sdp_session_ == NULL ){
-		sdp_session_ = sdp_connect(BDADDR_ANY, BDADDR_LOCAL, SDP_RETRY_IF_BUSY);
+		sdp_session_ = sdp_connect(&bd_addr_any, &bd_addr_local, SDP_RETRY_IF_BUSY);
 	}
 
@@ -275,5 +278,5 @@
 
 		bdaddr_t address;
-		uint8_t channel;
+//		uint8_t channel;
 
 		dev_id = hci_get_route(NULL);
@@ -339,5 +342,5 @@
 	char name[256], info1[256], info2[256], info3[256];
 
-	session = sdp_connect(BDADDR_ANY, &target, SDP_RETRY_IF_BUSY);
+	session = sdp_connect(&bd_addr_any, &target, SDP_RETRY_IF_BUSY);
 
 	if (session == NULL) {
@@ -401,5 +404,4 @@
 	 * Returns a string holding the bt adress in human readable form.
 	 */
-	char addr[32] = { 0 };
 	char str[32] = { 0 };
 	ba2str(ba, str);
Index: source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h
===================================================================
--- source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h	(revision 5973)
+++ source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.h	(revision 6919)
@@ -197,6 +197,6 @@
 	public:
 		udp_server(boost::asio::io_service& io_service, ServiceList* _services, boost::mutex* _servicesmutex)
-			: services(_services), servicesmutex(_servicesmutex),
-				socket_v4(io_service), socket_v6(io_service) {
+			: socket_v4(io_service), socket_v6(io_service),
+			  services(_services), servicesmutex(_servicesmutex) {
 
 			if( open4() ) start_receive_4();
@@ -350,5 +350,5 @@
 
 				{ // insert new found service
-					boost::mutex::scoped_lock( *servicesmutex );
+					boost::mutex::scoped_lock lock( *servicesmutex );
 
 					ServiceList::iterator it = services->find( msg.getName() );