diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
index f4e8bb128..fd2966b13 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/bluetooth/BluetoothPlugin.java
@@ -237,7 +237,7 @@ abstract class BluetoothPlugin<SS> implements DuplexPlugin, EventListener {
 			try {
 				conn = acceptConnection(ss);
 			} catch (IOException e) {
-				// This is expected when the socket is closed
+				// This is expected when the server socket is closed
 				LOG.info("Server socket closed");
 				state.clearServerSocket();
 				return;
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
index e92314ee5..63d059f83 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java
@@ -155,9 +155,9 @@ abstract class TcpPlugin implements DuplexPlugin {
 			InetSocketAddress local =
 					(InetSocketAddress) ss.getLocalSocketAddress();
 			setLocalSocketAddress(local);
-			callback.pluginStateChanged(getState());
 			if (LOG.isLoggable(INFO))
 				LOG.info("Listening on " + scrubSocketAddress(local));
+			callback.pluginStateChanged(getState());
 			acceptContactConnections(ss);
 		});
 	}
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
index 2ff626831..dc7e495e8 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
@@ -652,8 +652,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 								new TorTransportConnection(this, s));
 					}
 				} catch (IOException e) {
-					// This is expected when the socket is closed
-					if (LOG.isLoggable(INFO)) LOG.info(e.toString());
+					// This is expected when the server socket is closed
+					LOG.info("Rendezvous server socket closed");
 				}
 			});
 			Map<Integer, String> portLines =
@@ -682,9 +682,9 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 	public void circuitStatus(String status, String id, String path) {
 		if (status.equals("BUILT") &&
 				state.getAndSetCircuitBuilt()) {
-			callback.pluginStateChanged(getState());
 			LOG.info("First circuit built");
 			backoff.reset();
+			callback.pluginStateChanged(getState());
 		}
 	}
 
@@ -716,8 +716,8 @@ abstract class TorPlugin implements DuplexPlugin, EventHandler, EventListener {
 		if (LOG.isLoggable(INFO)) LOG.info(severity + " " + msg);
 		if (severity.equals("NOTICE") && msg.startsWith("Bootstrapped 100%")) {
 			state.setBootstrapped();
-			callback.pluginStateChanged(getState());
 			backoff.reset();
+			callback.pluginStateChanged(getState());
 		}
 	}