diff --git a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
index d63eeaa600e4165987001e8ed2fdd8f58341b49f..bdcd3113b625a79792a4970ace12e33ebbe0d797 100644
--- a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
+++ b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
@@ -233,6 +233,8 @@ 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);
 			}
@@ -255,7 +257,9 @@ class BluetoothPlugin extends AbstractPlugin implements StreamPlugin {
 			if(!started) return null;
 		}
 		try {
+			if(LOG.isLoggable(Level.INFO)) LOG.info("Connecting to " + url);
 			StreamConnection s = (StreamConnection) Connector.open(url);
+			if(LOG.isLoggable(Level.INFO)) LOG.info("Connected");
 			return new BluetoothTransportConnection(s);
 		} catch(IOException e) {
 			if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.getMessage());
diff --git a/components/net/sf/briar/plugins/bluetooth/ContactListener.java b/components/net/sf/briar/plugins/bluetooth/ContactListener.java
index 492fd4a1bc08718e09e173cc5d2c5addb080e078..544cb338f0822a095bf7f25463eb52a1200404a3 100644
--- a/components/net/sf/briar/plugins/bluetooth/ContactListener.java
+++ b/components/net/sf/briar/plugins/bluetooth/ContactListener.java
@@ -81,7 +81,8 @@ class ContactListener implements DiscoveryListener {
 		for(ServiceRecord record : services) {
 			// Do we recognise the address?
 			RemoteDevice device = record.getHostDevice();
-			ContactId c = addresses.get(device.getBluetoothAddress());
+			String address = device.getBluetoothAddress();
+			ContactId c = addresses.get(address);
 			if(c == null) continue;
 			// Do we have a UUID for this contact?
 			String uuid = uuids.get(c);
@@ -98,8 +99,10 @@ class ContactListener 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
+					if(LOG.isLoggable(Level.FINE))
+						LOG.fine("Discovered " + uuid + " at " + address);
 					urls.put(c, serviceUrl);
 				}
 			}