diff --git a/src/examples/export-sink.c b/src/examples/export-sink.c
index 1de693d5d..04a75086b 100644
--- a/src/examples/export-sink.c
+++ b/src/examples/export-sink.c
@@ -447,10 +447,9 @@ static void make_node(struct data *data)
 {
 	struct pw_properties *props;
 
-	props = pw_properties_new(
-			"pipewire.target.node", data->path,
-			"pipewire.autoconnect", "1",
-			NULL);
+	props = pw_properties_new("pipewire.autoconnect", "1", NULL);
+	if (data->path)
+		pw_properties_set(props, "pipewire.target.node", data->path);
 
 	data->node = pw_node_new(data->core, NULL, NULL, "SDL-sink", props, 0);
 	data->impl_node = impl_node;
diff --git a/src/examples/local-v4l2.c b/src/examples/local-v4l2.c
index 349f0128c..4b574ae2c 100644
--- a/src/examples/local-v4l2.c
+++ b/src/examples/local-v4l2.c
@@ -63,8 +63,6 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
 struct data {
 	struct type type;
 
-	const char *path;
-
 	SDL_Renderer *renderer;
 	SDL_Window *window;
 	SDL_Texture *texture;
@@ -464,7 +462,6 @@ int main(int argc, char *argv[])
 	data.running = true;
 	data.core = pw_core_new(data.loop, NULL);
 	data.t = pw_core_get_type(data.core);
-	data.path = argc > 1 ? argv[1] : NULL;
 
 	pw_module_load(data.core, "libpipewire-module-spa-node-factory", NULL);
 
diff --git a/src/modules/module-jack/jack-node.c b/src/modules/module-jack/jack-node.c
index cf51c24db..e43010cf2 100644
--- a/src/modules/module-jack/jack-node.c
+++ b/src/modules/module-jack/jack-node.c
@@ -379,14 +379,18 @@ static int port_enum_formats(struct spa_node *node, enum spa_direction direction
 	struct node_data *nd = SPA_CONTAINER_OF(node, struct node_data, node_impl);
 	struct port_data *pd = nd->port_data[direction][port_id];
 	struct type *t = &pd->node->type;
-        struct spa_pod_builder b = { NULL, };
+	struct spa_pod_builder b = { NULL, };
+	struct spa_format *fmt;
+	uint8_t buffer[4096];
+	int res;
+
         struct spa_pod_frame f[2];
 	struct jack_engine_control *ctrl = pd->node->node.server->engine_control;
 
 	if (index > 0)
 		return SPA_RESULT_ENUM_END;
 
-        spa_pod_builder_init(&b, pd->buffer, sizeof(pd->buffer));
+        spa_pod_builder_init(&b, buffer, sizeof(buffer));
 
 	if (pd->port.jack_port) {
 		if (pd->port.jack_port->type_id == 0) {
@@ -410,7 +414,13 @@ static int port_enum_formats(struct spa_node *node, enum spa_direction direction
                         PROP(&f[1], t->format_audio.rate, SPA_POD_TYPE_INT, ctrl->sample_rate),
                         PROP(&f[1], t->format_audio.channels, SPA_POD_TYPE_INT, 2));
 	}
-        *format = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_format);
+	fmt = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_format);
+
+        spa_pod_builder_init(&b, pd->buffer, sizeof(pd->buffer));
+        if ((res = spa_format_filter(fmt, filter, &b)) < 0)
+                return res;
+
+        *format = SPA_POD_BUILDER_DEREF(&b, 0, struct spa_format);
 
 	return SPA_RESULT_OK;
 }