diff --git a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
index bdcd3113b625a79792a4970ace12e33ebbe0d797..8a2cf684c01970541fe7dfb03249659011f39caa 100644
--- a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
+++ b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
@@ -233,8 +233,6 @@ class BluetoothPlugin extends AbstractPlugin implements StreamPlugin {
 			String address = p.get("address");
 			String uuid = p.get("uuid");
 			if(address != null && uuid != null) {
-				if(LOG.isLoggable(Level.FINE))
-					LOG.fine("Searching for " + uuid + " at " + address);
 				addresses.put(address, c);
 				uuids.put(c, uuid);
 			}
diff --git a/components/net/sf/briar/plugins/bluetooth/ContactListener.java b/components/net/sf/briar/plugins/bluetooth/ContactListener.java
index 544cb338f0822a095bf7f25463eb52a1200404a3..21b3cfc36da345a2ddd46f64367a5de330e1976d 100644
--- a/components/net/sf/briar/plugins/bluetooth/ContactListener.java
+++ b/components/net/sf/briar/plugins/bluetooth/ContactListener.java
@@ -81,8 +81,7 @@ class ContactListener implements DiscoveryListener {
 		for(ServiceRecord record : services) {
 			// Do we recognise the address?
 			RemoteDevice device = record.getHostDevice();
-			String address = device.getBluetoothAddress();
-			ContactId c = addresses.get(address);
+			ContactId c = addresses.get(device.getBluetoothAddress());
 			if(c == null) continue;
 			// Do we have a UUID for this contact?
 			String uuid = uuids.get(c);
@@ -101,8 +100,6 @@ class ContactListener implements DiscoveryListener {
 				UUID serviceUuid = (UUID) classId.getValue();
 				if(uuid.equalsIgnoreCase(serviceUuid.toString())) {
 					// The UUID matches - store the URL
-					if(LOG.isLoggable(Level.FINE))
-						LOG.fine("Discovered " + uuid + " at " + address);
 					urls.put(c, serviceUrl);
 				}
 			}
diff --git a/components/net/sf/briar/plugins/bluetooth/InvitationListener.java b/components/net/sf/briar/plugins/bluetooth/InvitationListener.java
index 96a94fc2091bb4b6147c37464052dcee1282880f..46265bdb2fcc2cc5a667733a6acc74c091874865 100644
--- a/components/net/sf/briar/plugins/bluetooth/InvitationListener.java
+++ b/components/net/sf/briar/plugins/bluetooth/InvitationListener.java
@@ -77,7 +77,7 @@ class InvitationListener implements DiscoveryListener {
 				(Enumeration<DataElement>) classIds.getValue();
 			for(DataElement classId : Collections.list(e)) {
 				UUID serviceUuid = (UUID) classId.getValue();
-				if(uuid.equals(serviceUuid.toString())) {
+				if(uuid.equalsIgnoreCase(serviceUuid.toString())) {
 					// The UUID matches - store the URL
 					synchronized(this) {
 						url = serviceUrl;