diff --git a/src/daemon/main.c b/src/daemon/main.c
index 967321bfb..3217f3c64 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
 		{"name",	1, NULL, 'n'},
 		{NULL,		0, NULL, 0}
 	};
-	int c;
+	int c, res;
 
 	pw_init(&argc, &argv);
 
@@ -119,8 +119,8 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	if (pw_daemon_config_run_commands(config, core) < 0) {
-		pw_log_error("failed to run config commands");
+	if ((res = pw_daemon_config_run_commands(config, core)) < 0) {
+		pw_log_error("failed to run config commands: %s", spa_strerror(res));
 		return -1;
 	}
 
diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c
index 31a46f66c..39589bcdf 100644
--- a/src/modules/module-client-node/client-node.c
+++ b/src/modules/module-client-node/client-node.c
@@ -241,7 +241,7 @@ static int clear_buffers(struct node *this, struct mix *mix)
 		struct buffer *b = &mix->buffers[i];
 		struct pw_memblock *m;
 
-		spa_log_debug(this->log, "node %p: clear buffer %d", this, i);
+		spa_log_debug(this->log, NAME" %p: clear buffer %d", this, i);
 
 		for (j = 0; j < b->buffer.n_datas; j++) {
 			struct spa_data *d = &b->datas[j];
@@ -456,7 +456,7 @@ do_update_port(struct node *this,
 	if (change_mask & PW_CLIENT_NODE_PORT_UPDATE_PARAMS) {
 		port->have_format = false;
 
-		spa_log_debug(this->log, "node %p: port %u update %d params", this, port->id, n_params);
+		spa_log_debug(this->log, NAME" %p: port %u update %d params", this, port->id, n_params);
 		for (i = 0; i < port->n_params; i++)
 			free(port->params[i]);
 		port->n_params = n_params;
@@ -496,7 +496,7 @@ clear_port(struct node *this, struct port *port)
 {
 	int i;
 
-	spa_log_debug(this->log, "node %p: clear port %p", this, port);
+	spa_log_debug(this->log, NAME" %p: clear port %p", this, port);
 
 	if (port == NULL)
 		return;
@@ -616,7 +616,7 @@ impl_node_port_set_param(void *object,
 	spa_return_val_if_fail(this != NULL, -EINVAL);
 	spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
 
-	pw_log_debug("node %p: port %d.%d add param %s %d", this,
+	pw_log_debug(NAME" %p: port %d.%d add param %s %d", this,
 			direction, port_id,
 			spa_debug_type_find_name(spa_type_param, id), id);
 
@@ -641,7 +641,7 @@ static int do_port_set_io(struct impl *impl,
 	uint32_t tag[5] = { impl->node_id, direction, port_id, mix_id, id };
 	struct pw_memmap *mm;
 
-	pw_log_debug(NAME " %p: %s port %d.%d set io %p %zd", impl,
+	pw_log_debug(NAME " %p: %s port %d.%d set io %p %zd", this,
 			direction == SPA_DIRECTION_INPUT ? "input" : "output",
 			port_id, mix_id, data, size);
 
@@ -709,7 +709,7 @@ do_port_use_buffers(struct impl *impl,
 	uint32_t i, j;
 	struct pw_client_node_buffer *mb;
 
-	spa_log_debug(this->log, NAME " %p: %s port %d.%d use buffers %p %u flags:%08x", impl,
+	spa_log_debug(this->log, NAME " %p: %s port %d.%d use buffers %p %u flags:%08x", this,
 			direction == SPA_DIRECTION_INPUT ? "input" : "output",
 			port_id, mix_id, buffers, n_buffers, flags);
 
@@ -776,7 +776,7 @@ do_port_use_buffers(struct impl *impl,
 		mb[i].mem_id = m->id;
 		mb[i].offset = SPA_PTRDIFF(baseptr, SPA_MEMBER(mem->map->ptr, 0, void));
 		mb[i].size = data_size;
-		spa_log_debug(this->log, "buffer %d %d %d %d", i, mb[i].mem_id,
+		spa_log_debug(this->log, NAME" %p: buffer %d %d %d %d", this, i, mb[i].mem_id,
 				mb[i].offset, mb[i].size);
 
 		for (j = 0; j < buffers[i]->n_metas; j++)
@@ -869,7 +869,7 @@ static int impl_node_process(void *object)
 	n->rt.activation->signal_time = SPA_TIMESPEC_TO_NSEC(&ts);
 
 	if (spa_system_eventfd_write(this->data_system, this->writefd, 1) < 0)
-		spa_log_warn(this->log, "node %p: error %m", this);
+		spa_log_warn(this->log, NAME" %p: error %m", this);
 
 	return SPA_STATUS_OK;
 }
@@ -883,7 +883,7 @@ client_node_get_node(void *data,
 	struct node *this = &impl->node;
 	uint32_t new_id = user_data_size;
 
-	pw_log_debug("node %p: bind %u/%u", this, new_id, version);
+	pw_log_debug(NAME" %p: bind %u/%u", this, new_id, version);
 
 	impl->bind_node_version = version;
 	impl->bind_node_id = new_id;
@@ -904,7 +904,7 @@ client_node_update(void *data,
 
 	if (change_mask & PW_CLIENT_NODE_UPDATE_PARAMS) {
 		uint32_t i;
-		pw_log_debug("node %p: update %d params", this, n_params);
+		pw_log_debug(NAME" %p: update %d params", this, n_params);
 
 		for (i = 0; i < this->n_params; i++)
 			free(this->params[i]);
@@ -917,7 +917,7 @@ client_node_update(void *data,
 	if (change_mask & PW_CLIENT_NODE_UPDATE_INFO) {
 		spa_node_emit_info(&this->hooks, info);
 	}
-	pw_log_debug("node %p: got node update", this);
+	pw_log_debug(NAME" %p: got node update", this);
 	return 0;
 }
 
@@ -935,7 +935,7 @@ client_node_port_update(void *data,
 	struct port *port;
 	bool remove;
 
-	spa_log_debug(this->log, "node %p: got port update", this);
+	spa_log_debug(this->log, NAME" %p: got port update", this);
 	if (!CHECK_PORT_ID(this, direction, port_id))
 		return -EINVAL;
 
@@ -992,7 +992,7 @@ static int client_node_port_buffers(void *data,
 	struct mix *mix;
 	uint32_t i, j;
 
-	spa_log_debug(this->log, NAME " %p: %s port %d.%d buffers %p %u", impl,
+	spa_log_debug(this->log, NAME " %p: %s port %d.%d buffers %p %u", this,
 			direction == SPA_DIRECTION_INPUT ? "input" : "output",
 			port_id, mix_id, buffers, n_buffers);
 
@@ -1045,7 +1045,7 @@ static void node_on_data_fd_events(struct spa_source *source)
 	struct node *this = source->data;
 
 	if (source->rmask & (SPA_IO_ERR | SPA_IO_HUP)) {
-		spa_log_warn(this->log, "node %p: got error", this);
+		spa_log_warn(this->log, NAME" %p: got error", this);
 		return;
 	}
 
@@ -1054,9 +1054,9 @@ static void node_on_data_fd_events(struct spa_source *source)
 
 		if (spa_system_eventfd_read(this->data_system,
 					this->data_source.fd, &cmd) < 0 || cmd != 1)
-			spa_log_warn(this->log, "node %p: read %"PRIu64" failed %m", this, cmd);
+			spa_log_warn(this->log, NAME" %p: read %"PRIu64" failed %m", this, cmd);
 
-		spa_log_trace_fp(this->log, "node %p: got ready", this);
+		spa_log_trace_fp(this->log, NAME" %p: got ready", this);
 		spa_node_call_ready(&this->callbacks, SPA_STATUS_HAVE_BUFFER);
 	}
 }
@@ -1155,7 +1155,7 @@ static void client_node_resource_destroy(void *data)
 	struct pw_client_node *this = &impl->this;
 	struct node *node = &impl->node;
 
-	pw_log_debug(NAME " %p: destroy", impl);
+	pw_log_debug(NAME " %p: destroy", node);
 
 	impl->node.resource = this->resource = NULL;
 	spa_hook_remove(&impl->resource_listener);
@@ -1202,11 +1202,11 @@ void pw_client_node_registered(struct pw_client_node *this, struct pw_global *gl
 	uint32_t node_id = global->id;
 	struct pw_memblock *m;
 
-	pw_log_debug(NAME " %p: %d", this, node_id);
+	pw_log_debug(NAME " %p: %d", &impl->node, node_id);
 
 	m = pw_mempool_import_block(client->pool, node->activation);
 	if (m == NULL) {
-		pw_log_debug(NAME " %p: can't import block: %m", this);
+		pw_log_debug(NAME " %p: can't import block: %m", &impl->node);
 		return;
 	}
 	impl->node_id = node_id;
@@ -1232,19 +1232,19 @@ static void node_initialized(void *data)
 {
 	struct impl *impl = data;
 	struct pw_client_node *this = &impl->this;
-	struct pw_node *node = this->node;
+	struct node *node = &impl->node;
 	struct pw_global *global;
 	struct spa_system *data_system = impl->node.data_system;
 	size_t size;
 
 	impl->fds[0] = spa_system_eventfd_create(data_system, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
 	impl->fds[1] = spa_system_eventfd_create(data_system, SPA_FD_CLOEXEC | SPA_FD_NONBLOCK);
-	impl->node.data_source.fd = impl->fds[0];
-	impl->node.writefd = impl->fds[1];
 	impl->other_fds[0] = impl->fds[1];
 	impl->other_fds[1] = impl->fds[0];
+	node->data_source.fd = impl->fds[0];
+	node->writefd = impl->fds[1];
 
-	spa_loop_add_source(impl->node.data_loop, &impl->node.data_source);
+	spa_loop_add_source(node->data_loop, &node->data_source);
 	pw_log_debug(NAME " %p: transport fd %d %d", node, impl->fds[0], impl->fds[1]);
 
 	size = sizeof(struct spa_io_buffers) * MAX_AREAS;
@@ -1259,7 +1259,7 @@ static void node_initialized(void *data)
 
 	pw_log_debug(NAME " %p: io areas %p", node, impl->io_areas->map->ptr);
 
-	if ((global = pw_node_get_global(node)) != NULL)
+	if ((global = pw_node_get_global(this->node)) != NULL)
 		pw_client_node_registered(this, global);
 }
 
@@ -1267,12 +1267,13 @@ static void node_free(void *data)
 {
 	struct impl *impl = data;
 	struct pw_client_node *this = &impl->this;
-	struct spa_system *data_system = impl->node.data_system;
+	struct node *node = &impl->node;
+	struct spa_system *data_system = node->data_system;
 
 	this->node = NULL;
 
-	pw_log_debug(NAME " %p: free", &impl->this);
-	node_clear(&impl->node);
+	pw_log_debug(NAME " %p: free", node);
+	node_clear(node);
 
 	spa_hook_remove(&impl->node_listener);
 
@@ -1319,9 +1320,10 @@ static int port_release_mix(void *data, struct pw_port_mix *mix)
 {
 	struct port *port = data;
 	struct impl *impl = port->impl;
+	struct node *this = &impl->node;
 	struct mix *m;
 
-	pw_log_debug(NAME " %p: remove mix io %d %p %p", impl, mix->id, mix->io,
+	pw_log_debug(NAME " %p: remove mix io %d %p %p", this, mix->id, mix->io,
 			impl->io_areas->map->ptr);
 
 	if ((m = find_mix(port, mix->port.port_id)) == NULL || !m->valid)
@@ -1447,7 +1449,7 @@ static void node_port_init(void *data, struct pw_port *port)
 	struct port *p = pw_port_get_user_data(port);
 	struct node *this = &impl->node;
 
-	pw_log_debug(NAME " %p: port %p init", &impl->this, port);
+	pw_log_debug(NAME " %p: port %p init", this, port);
 
 	*p = this->dummy;
 	p->port = port;
@@ -1490,7 +1492,7 @@ static void node_port_removed(void *data, struct pw_port *port)
 	struct node *this = &impl->node;
 	struct port *p = pw_port_get_user_data(port);
 
-	pw_log_debug(NAME " %p: port %p remove", &impl->this, port);
+	pw_log_debug(NAME " %p: port %p remove", this, port);
 
 	p->removed = true;
 	clear_port(this, p);
@@ -1530,11 +1532,11 @@ static void node_peer_removed(void *data, struct pw_node *peer)
 	m = pw_mempool_find_fd(this->client->pool,
 			peer->activation->fd);
 	if (m == NULL) {
-		pw_log_warn(NAME " %p: unknown peer %p fd:%d", &impl->this, peer,
+		pw_log_warn(NAME " %p: unknown peer %p fd:%d", this, peer,
 			peer->source.fd);
 		return;
 	}
-	pw_log_debug(NAME " %p: peer %p %u removed", &impl->this, peer,
+	pw_log_debug(NAME " %p: peer %p %u removed", this, peer,
 			peer->info.id);
 
 	if (this->resource != NULL) {
@@ -1552,8 +1554,9 @@ static void node_peer_removed(void *data, struct pw_node *peer)
 static void node_driver_changed(void *data, struct pw_node *old, struct pw_node *driver)
 {
 	struct impl *impl = data;
+	struct node *this = &impl->node;
 
-	pw_log_debug(NAME " %p: driver changed %p -> %p", &impl->this, old, driver);
+	pw_log_debug(NAME " %p: driver changed %p -> %p", this, old, driver);
 
 	node_peer_removed(data, old);
 	node_peer_added(data, driver);
@@ -1581,8 +1584,9 @@ static const struct pw_resource_events resource_events = {
 static int process_node(void *data)
 {
 	struct impl *impl = data;
-	pw_log_trace_fp(NAME " %p: process", impl);
-	return spa_node_process((struct spa_node*)&impl->node.node);
+	struct node *this = &impl->node;
+	pw_log_trace_fp(NAME " %p: process", this);
+	return spa_node_process(&this->node);
 }
 
 /** Create a new client node
@@ -1619,7 +1623,7 @@ struct pw_client_node *pw_client_node_new(struct pw_resource *resource,
 
 	impl->core = core;
 	impl->fds[0] = impl->fds[1] = -1;
-	pw_log_debug(NAME " %p: new", impl);
+	pw_log_debug(NAME " %p: new", &impl->node);
 
 	support = pw_core_get_support(impl->core, &n_support);
 	node_init(&impl->node, NULL, support, n_support);
diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c
index dfe98d97a..323e0591f 100644
--- a/src/modules/module-protocol-native.c
+++ b/src/modules/module-protocol-native.c
@@ -49,6 +49,8 @@
 #include "modules/module-protocol-native/connection.h"
 #include "modules/module-protocol-native/defs.h"
 
+#define NAME "protocol-native"
+
 #ifndef UNIX_PATH_MAX
 #define UNIX_PATH_MAX   108
 #endif
@@ -132,7 +134,7 @@ process_messages(struct client_data *data)
 
 		client->recv_seq = msg->seq;
 
-		pw_log_trace("protocol-native %p: got message %d from %u", client->protocol,
+		pw_log_trace(NAME" %p: got message %d from %u", client->protocol,
 			     msg->opcode, msg->id);
 
 		if (debug_messages) {
@@ -143,7 +145,7 @@ process_messages(struct client_data *data)
 
 		resource = pw_client_find_resource(client, msg->id);
 		if (resource == NULL) {
-			pw_log_error("protocol-native %p: unknown resource %u op:%u",
+			pw_log_error(NAME" %p: unknown resource %u op:%u",
 				     client->protocol, msg->id, msg->opcode);
 			pw_resource_error(client->core_resource,
 					-EINVAL, "unknown resource %u op:%u", msg->id, msg->opcode);
@@ -164,7 +166,7 @@ process_messages(struct client_data *data)
 		required = demarshal[msg->opcode].permissions | PW_PERM_X;
 
 		if ((required & permissions) != required) {
-			pw_log_error("protocol-native %p: method %u on %u requires %08x, have %08x",
+			pw_log_error(NAME" %p: method %u on %u requires %08x, have %08x",
 				     client->protocol, msg->opcode, msg->id, required, permissions);
 			pw_resource_error(resource,
 				-EACCES, "no permission to call method %u ", msg->opcode, msg->id);
@@ -179,14 +181,14 @@ done:
 	return;
 
 invalid_method:
-	pw_log_error("protocol-native %p: invalid method id:%u op:%u",
+	pw_log_error(NAME" %p: invalid method id:%u op:%u",
 		     client->protocol, msg->id, msg->opcode);
 	pw_resource_error(resource, -EINVAL, "invalid method id:%u op:%u",
 			msg->id, msg->opcode);
 	pw_client_destroy(client);
 	goto done;
 invalid_message:
-	pw_log_error("protocol-native %p: invalid message received id:%u op:%u (%s)",
+	pw_log_error(NAME" %p: invalid message received id:%u op:%u (%s)",
 		     client->protocol, msg->id, msg->opcode, spa_strerror(res));
 	pw_resource_error(resource, res, "invalid message received id:%u op:%u (%s)",
 			msg->id, msg->opcode, spa_strerror(res));
@@ -207,7 +209,7 @@ client_busy_changed(void *data, bool busy)
 	if (!busy)
 		mask |= SPA_IO_IN;
 
-	pw_log_debug("protocol-native %p: busy changed %d", client->protocol, busy);
+	pw_log_debug(NAME" %p: busy changed %d", client->protocol, busy);
 	pw_loop_update_io(client->core->main_loop, c->source, mask);
 
 	if (!busy)
@@ -222,7 +224,7 @@ connection_data(void *data, int fd, uint32_t mask)
 	struct pw_client *client = this->client;
 
 	if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
-		pw_log_info("protocol-native %p: client %p disconnected", client->protocol, client);
+		pw_log_info(NAME" %p: client %p disconnected", client->protocol, client);
 		pw_client_destroy(client);
 		return;
 	}
@@ -268,7 +270,7 @@ static struct pw_client *client_new(struct server *s, int fd)
 
 	len = sizeof(ucred);
 	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &len) < 0) {
-		pw_log_error("no peercred: %m");
+		pw_log_error("server %p: no peercred: %m", s);
 	} else {
 		pw_properties_setf(props, PW_KEY_SEC_PID, "%d", ucred.pid);
 		pw_properties_setf(props, PW_KEY_SEC_UID, "%d", ucred.uid);
@@ -277,7 +279,7 @@ static struct pw_client *client_new(struct server *s, int fd)
 
 	len = sizeof(buffer);
 	if (getsockopt(fd, SOL_SOCKET, SO_PEERSEC, buffer, &len) < 0) {
-		pw_log_error("no peersec: %m");
+		pw_log_error("server %p: no peersec: %m", s);
 	} else {
 		pw_properties_setf(props, PW_KEY_SEC_LABEL, "%s", buffer);
 	}
@@ -330,7 +332,7 @@ static int init_socket_name(struct server *s, const char *name)
 	const char *runtime_dir;
 
 	if ((runtime_dir = getenv("XDG_RUNTIME_DIR")) == NULL) {
-		pw_log_error("XDG_RUNTIME_DIR not set in the environment");
+		pw_log_error("server %p: XDG_RUNTIME_DIR not set in the environment", s);
 		return -EIO;
 	}
 
@@ -339,8 +341,8 @@ static int init_socket_name(struct server *s, const char *name)
 			     "%s/%s", runtime_dir, name) + 1;
 
 	if (name_size > (int) sizeof(s->addr.sun_path)) {
-		pw_log_error("socket path \"%s/%s\" plus null terminator exceeds 108 bytes",
-			     runtime_dir, name);
+		pw_log_error("server %p: socket path \"%s/%s\" plus null terminator exceeds 108 bytes",
+				s, runtime_dir, name);
 		*s->addr.sun_path = 0;
 		return -ENAMETOOLONG;
 	}
@@ -358,14 +360,15 @@ static int lock_socket(struct server *s)
 
 	if (s->fd_lock < 0) {
 		res = -errno;
-		pw_log_error("unable to open lockfile '%s': %m", s->lock_addr);
+		pw_log_error("server %p: unable to open lockfile '%s': %m", s, s->lock_addr);
 		goto err;
 	}
 
 	if (flock(s->fd_lock, LOCK_EX | LOCK_NB) < 0) {
 		res = -errno;
-		pw_log_error("unable to lock lockfile '%s': %m (maybe another daemon is running)",
-			     s->lock_addr);
+		pw_log_error("server %p: unable to lock lockfile '%s': %m"
+				" (maybe another daemon is running)",
+				s, s->lock_addr);
 		goto err_fd;
 	}
 	return 0;
@@ -392,13 +395,13 @@ socket_data(void *data, int fd, uint32_t mask)
 	length = sizeof(name);
 	client_fd = accept4(fd, (struct sockaddr *) &name, &length, SOCK_CLOEXEC);
 	if (client_fd < 0) {
-		pw_log_error("failed to accept: %m");
+		pw_log_error("server %p: failed to accept: %m", s);
 		return;
 	}
 
 	client = client_new(s, client_fd);
 	if (client == NULL) {
-		pw_log_error("failed to create client");
+		pw_log_error("server %p: failed to create client", s);
 		close(client_fd);
 		return;
 	}
@@ -423,7 +426,8 @@ static int add_socket(struct pw_protocol *protocol, struct server *s)
 						1, s->addr.sun_path, 0) > 0) {
 				fd = SD_LISTEN_FDS_START + i;
 				activated = true;
-				pw_log_info("Found socket activation socket for '%s'", s->addr.sun_path);
+				pw_log_info("server %p: Found socket activation socket for '%s'",
+						s, s->addr.sun_path);
 				break;
 			}
 		}
@@ -439,13 +443,13 @@ static int add_socket(struct pw_protocol *protocol, struct server *s)
 		size = offsetof(struct sockaddr_un, sun_path) + strlen(s->addr.sun_path);
 		if (bind(fd, (struct sockaddr *) &s->addr, size) < 0) {
 			res = -errno;
-			pw_log_error("bind() failed with error: %m");
+			pw_log_error("server %p: bind() failed with error: %m", s);
 			goto error_close;
 		}
 
 		if (listen(fd, 128) < 0) {
 			res = -errno;
-			pw_log_error("listen() failed with error: %m");
+			pw_log_error("server %p: listen() failed with error: %m", s);
 			goto error_close;
 		}
 	}
@@ -517,7 +521,7 @@ on_remote_data(void *data, int fd, uint32_t mask)
 			if (res == 0)
 				break;
 
-                        pw_log_trace("protocol-native %p: got message %d from %u seq:%d",
+                        pw_log_trace(NAME" %p: got message %d from %u seq:%d",
 					this, msg->opcode, msg->id, msg->seq);
 
 			this->recv_seq = msg->seq;
@@ -536,21 +540,21 @@ on_remote_data(void *data, int fd, uint32_t mask)
                         }
 
 			marshal = pw_proxy_get_marshal(proxy);
-                        if (marshal == NULL || msg->opcode >= marshal->n_events) {
-                                pw_log_error("protocol-native %p: invalid method %u for %u (%d)",
+			if (marshal == NULL || msg->opcode >= marshal->n_events) {
+				pw_log_error(NAME" %p: invalid method %u for %u (%d)",
 						this, msg->opcode, msg->id,
 						marshal ? marshal->n_events : (uint32_t)-1);
-                                continue;
+				continue;
                         }
 
                         demarshal = marshal->event_demarshal;
 			if (!demarshal[msg->opcode].func) {
-                                pw_log_error("protocol-native %p: function %d not implemented on %u",
+                                pw_log_error(NAME" %p: function %d not implemented on %u",
 						this, msg->opcode, msg->id);
 				continue;
 			}
 			if (demarshal[msg->opcode].func(proxy, msg) < 0) {
-				pw_log_error ("protocol-native %p: invalid message received %u for %u",
+				pw_log_error (NAME" %p: invalid message received %u for %u",
 						this, msg->opcode, msg->id);
 				continue;
 			}
@@ -558,7 +562,7 @@ on_remote_data(void *data, int fd, uint32_t mask)
         }
 	return;
 error:
-	pw_log_error("protocol-native %p: got connection error %d (%s)", impl, res, spa_strerror(res));
+	pw_log_error(NAME" %p: got connection error %d (%s)", impl, res, spa_strerror(res));
 	pw_loop_destroy_source(pw_core_get_main_loop(core), impl->source);
 	impl->source = NULL;
 	pw_remote_disconnect(this);
@@ -802,7 +806,7 @@ impl_add_server(struct pw_protocol *protocol,
 	if ((res = add_socket(protocol, s)) < 0)
 		goto error;
 
-	pw_log_info("protocol-native %p: Added server %p %s", protocol, this, name);
+	pw_log_info(NAME" %p: Added server %p %s", protocol, this, name);
 
 	return this;
 
@@ -922,7 +926,7 @@ static int module_init(struct pw_module *module, struct pw_properties *propertie
 
 	pw_protocol_native_init(this);
 
-	pw_log_debug("protocol-native %p: new %d", this, debug_messages);
+	pw_log_debug(NAME" %p: new %d", this, debug_messages);
 
 	d = pw_protocol_get_user_data(this);
 	d->protocol = this;
diff --git a/src/pipewire/resource.c b/src/pipewire/resource.c
index 7bea49757..c55266225 100644
--- a/src/pipewire/resource.c
+++ b/src/pipewire/resource.c
@@ -216,6 +216,7 @@ void pw_resource_destroy(struct pw_resource *resource)
 	if (client->core_resource && !resource->removed)
 		pw_core_resource_remove_id(client->core_resource, resource->id);
 
-	pw_log_debug(NAME" %p: free", resource);
+	pw_log_debug(NAME" %p: free %u", resource, resource->id);
+
 	free(resource);
 }
diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c
index 9406c70f8..25ef09548 100644
--- a/src/pipewire/stream.c
+++ b/src/pipewire/stream.c
@@ -265,6 +265,7 @@ static bool stream_set_state(struct pw_stream *stream, enum pw_stream_state stat
 {
 	enum pw_stream_state old = stream->state;
 	bool res = old != state;
+
 	if (res) {
 		free(stream->error);
 		stream->error = error ? strdup(error) : NULL;
@@ -490,16 +491,15 @@ static int impl_port_enum_params(void *object, int seq,
 	return 0;
 }
 
-static int port_set_format(void *object,
+static int port_set_format(struct stream *impl,
 			   enum spa_direction direction, uint32_t port_id,
 			   uint32_t flags, const struct spa_pod *format)
 {
-	struct stream *impl = object;
 	struct pw_stream *stream = &impl->this;
 	struct param *p;
 	int count, res;
 
-	pw_log_debug(NAME" %p: format changed:", impl);
+	pw_log_debug(NAME" %p: format changed: %p %d", impl, format, impl->disconnecting);
 	if (pw_log_level_enabled(SPA_LOG_LEVEL_DEBUG))
 		spa_debug_format(2, NULL, format);