diff --git a/src/examples/media-session/policy-node.c b/src/examples/media-session/policy-node.c
index d65804d13..76f2d8be4 100644
--- a/src/examples/media-session/policy-node.c
+++ b/src/examples/media-session/policy-node.c
@@ -221,7 +221,7 @@ handle_node(struct impl *impl, struct sm_object *object)
 		node->direction = direction;
 		node->type = NODE_TYPE_STREAM;
 		node->media = strdup(media_class);
-		pw_log_debug(NAME "%p: node %d is stream %s", impl, object->id, node->media);
+		pw_log_debug(NAME" %p: node %d is stream %s", impl, object->id, node->media);
 	}
 	else {
 		const char *media;
diff --git a/src/pipewire/filter.c b/src/pipewire/filter.c
index 784989c9a..a5c91d253 100644
--- a/src/pipewire/filter.c
+++ b/src/pipewire/filter.c
@@ -936,12 +936,12 @@ filter_new(struct pw_context *context, const char *name,
 	}
 
 	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL && extra) {
-		if ((str = pw_properties_get(extra, PW_KEY_APP_NAME)) != NULL)
-			pw_properties_set(props, PW_KEY_NODE_NAME, str);
-		else if ((str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY)) != NULL)
-			pw_properties_set(props, PW_KEY_NODE_NAME, str);
-		else
-			pw_properties_set(props, PW_KEY_NODE_NAME, name);
+		str = pw_properties_get(extra, PW_KEY_APP_NAME);
+		if (str == NULL)
+			str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY);
+		if (str == NULL)
+			str = name;
+		pw_properties_set(props, PW_KEY_NODE_NAME, name);
 	}
 
 	spa_hook_list_init(&impl->hooks);
diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c
index b79bb8158..17c2dfd00 100644
--- a/src/pipewire/stream.c
+++ b/src/pipewire/stream.c
@@ -1076,12 +1076,12 @@ stream_new(struct pw_context *context, const char *name,
 		pw_properties_set(props, PW_KEY_STREAM_IS_LIVE, "1");
 
 	if (pw_properties_get(props, PW_KEY_NODE_NAME) == NULL && extra) {
-		if ((str = pw_properties_get(extra, PW_KEY_APP_NAME)) != NULL)
-			pw_properties_set(props, PW_KEY_NODE_NAME, str);
-		else if ((str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY)) != NULL)
-			pw_properties_set(props, PW_KEY_NODE_NAME, str);
-		else
-			pw_properties_set(props, PW_KEY_NODE_NAME, name);
+		str = pw_properties_get(extra, PW_KEY_APP_NAME);
+		if (str == NULL)
+			str = pw_properties_get(extra, PW_KEY_APP_PROCESS_BINARY);
+		if (str == NULL)
+			str = name;
+		pw_properties_set(props, PW_KEY_NODE_NAME, name);
 	}
 
 	spa_hook_list_init(&impl->hooks);