diff --git a/spa/include/spa/node/command.h b/spa/include/spa/node/command.h
index 7b2ccedea..edc77f182 100644
--- a/spa/include/spa/node/command.h
+++ b/spa/include/spa/node/command.h
@@ -95,7 +95,7 @@ struct spa_command_node_clock_update {
 };
 
 #define SPA_COMMAND_NODE_CLOCK_UPDATE_INIT(type,change_mask,rate,ticks,monotonic_time,offset,scale,state,flags,latency)  \
-	SPA_COMMAND_INIT_COMPLEX(struct spa_command_node_clock_update,			\
+	SPA_COMMAND_INIT_FULL(struct spa_command_node_clock_update,			\
 			sizeof(struct spa_command_node_clock_update_body), type,	\
 			SPA_POD_INT_INIT(change_mask),					\
 			SPA_POD_INT_INIT(rate),						\
diff --git a/spa/include/spa/node/event.h b/spa/include/spa/node/event.h
index 060697c2b..9b1ac5cd9 100644
--- a/spa/include/spa/node/event.h
+++ b/spa/include/spa/node/event.h
@@ -71,7 +71,7 @@ struct spa_event_node_request_clock_update {
 };
 
 #define SPA_EVENT_NODE_REQUEST_CLOCK_UPDATE_INIT(type,update_mask,timestamp,offset)	\
-	SPA_EVENT_INIT_COMPLEX(struct spa_event_node_request_clock_update,		\
+	SPA_EVENT_INIT_FULL(struct spa_event_node_request_clock_update,		\
 		sizeof(struct spa_event_node_request_clock_update_body), type,		\
 		SPA_POD_INT_INIT(update_mask),						\
 		SPA_POD_LONG_INIT(timestamp),						\
diff --git a/spa/include/spa/pod/builder.h b/spa/include/spa/pod/builder.h
index 6cee16828..835054dd1 100644
--- a/spa/include/spa/pod/builder.h
+++ b/spa/include/spa/pod/builder.h
@@ -52,7 +52,7 @@ struct spa_pod_builder {
 	struct spa_pod_frame frame[SPA_POD_MAX_DEPTH];
 };
 
-#define SPA_POD_BUILDER_INIT(buffer,size)  { buffer, size, }
+#define SPA_POD_BUILDER_INIT(buffer,size)  (struct spa_pod_builder){ buffer, size, }
 
 static inline void
 spa_pod_builder_get_state(struct spa_pod_builder *builder, struct spa_pod_builder_state *state)
@@ -71,7 +71,7 @@ spa_pod_builder_reset(struct spa_pod_builder *builder, struct spa_pod_builder_st
 
 static inline void spa_pod_builder_init(struct spa_pod_builder *builder, void *data, uint32_t size)
 {
-	*builder = (struct spa_pod_builder) SPA_POD_BUILDER_INIT(data, size);
+	*builder = SPA_POD_BUILDER_INIT(data, size);
 }
 
 static inline void *
@@ -179,7 +179,7 @@ spa_pod_builder_primitive(struct spa_pod_builder *builder, const struct spa_pod
 	return ref;
 }
 
-#define SPA_POD_NONE_INIT() { 0, SPA_POD_TYPE_NONE }
+#define SPA_POD_NONE_INIT() (struct spa_pod) { 0, SPA_POD_TYPE_NONE }
 
 static inline uint32_t spa_pod_builder_none(struct spa_pod_builder *builder)
 {
@@ -187,7 +187,7 @@ static inline uint32_t spa_pod_builder_none(struct spa_pod_builder *builder)
 	return spa_pod_builder_primitive(builder, &p);
 }
 
-#define SPA_POD_BOOL_INIT(val) { { sizeof(uint32_t), SPA_POD_TYPE_BOOL }, val ? 1 : 0 }
+#define SPA_POD_BOOL_INIT(val) (struct spa_pod_bool){ { sizeof(uint32_t), SPA_POD_TYPE_BOOL }, val ? 1 : 0 }
 
 static inline uint32_t spa_pod_builder_bool(struct spa_pod_builder *builder, bool val)
 {
@@ -195,7 +195,7 @@ static inline uint32_t spa_pod_builder_bool(struct spa_pod_builder *builder, boo
 	return spa_pod_builder_primitive(builder, &p.pod);
 }
 
-#define SPA_POD_ID_INIT(val) { { sizeof(uint32_t), SPA_POD_TYPE_ID }, val }
+#define SPA_POD_ID_INIT(val) (struct spa_pod_id){ { sizeof(uint32_t), SPA_POD_TYPE_ID }, val }
 
 static inline uint32_t spa_pod_builder_id(struct spa_pod_builder *builder, uint32_t val)
 {
@@ -203,7 +203,7 @@ static inline uint32_t spa_pod_builder_id(struct spa_pod_builder *builder, uint3
 	return spa_pod_builder_primitive(builder, &p.pod);
 }
 
-#define SPA_POD_INT_INIT(val) { { sizeof(uint32_t), SPA_POD_TYPE_INT }, val }
+#define SPA_POD_INT_INIT(val) (struct spa_pod_int){ { sizeof(uint32_t), SPA_POD_TYPE_INT }, val }
 
 static inline uint32_t spa_pod_builder_int(struct spa_pod_builder *builder, int32_t val)
 {
@@ -211,7 +211,7 @@ static inline uint32_t spa_pod_builder_int(struct spa_pod_builder *builder, int3
 	return spa_pod_builder_primitive(builder, &p.pod);
 }
 
-#define SPA_POD_LONG_INIT(val) { { sizeof(uint64_t), SPA_POD_TYPE_LONG }, val }
+#define SPA_POD_LONG_INIT(val) (struct spa_pod_long){ { sizeof(uint64_t), SPA_POD_TYPE_LONG }, val }
 
 static inline uint32_t spa_pod_builder_long(struct spa_pod_builder *builder, int64_t val)
 {
@@ -219,7 +219,7 @@ static inline uint32_t spa_pod_builder_long(struct spa_pod_builder *builder, int
 	return spa_pod_builder_primitive(builder, &p.pod);
 }
 
-#define SPA_POD_FLOAT_INIT(val) { { sizeof(float), SPA_POD_TYPE_FLOAT }, val }
+#define SPA_POD_FLOAT_INIT(val) (struct spa_pod_float){ { sizeof(float), SPA_POD_TYPE_FLOAT }, val }
 
 static inline uint32_t spa_pod_builder_float(struct spa_pod_builder *builder, float val)
 {
@@ -227,7 +227,7 @@ static inline uint32_t spa_pod_builder_float(struct spa_pod_builder *builder, fl
 	return spa_pod_builder_primitive(builder, &p.pod);
 }
 
-#define SPA_POD_DOUBLE_INIT(val) { { sizeof(double), SPA_POD_TYPE_DOUBLE }, val }
+#define SPA_POD_DOUBLE_INIT(val) (struct spa_pod_double){ { sizeof(double), SPA_POD_TYPE_DOUBLE }, val }
 
 static inline uint32_t spa_pod_builder_double(struct spa_pod_builder *builder, double val)
 {
@@ -235,7 +235,7 @@ static inline uint32_t spa_pod_builder_double(struct spa_pod_builder *builder, d
 	return spa_pod_builder_primitive(builder, &p.pod);
 }
 
-#define SPA_POD_STRING_INIT(len) { { len, SPA_POD_TYPE_STRING } }
+#define SPA_POD_STRING_INIT(len) (struct spa_pod_string){ { len, SPA_POD_TYPE_STRING } }
 
 static inline uint32_t
 spa_pod_builder_write_string(struct spa_pod_builder *builder, const char *str, uint32_t len)
@@ -265,7 +265,7 @@ static inline uint32_t spa_pod_builder_string(struct spa_pod_builder *builder, c
 	return spa_pod_builder_string_len(builder, str ? str : "", len);
 }
 
-#define SPA_POD_BYTES_INIT(len) { { len, SPA_POD_TYPE_BYTES } }
+#define SPA_POD_BYTES_INIT(len) (struct spa_pod_bytes){ { len, SPA_POD_TYPE_BYTES } }
 
 static inline uint32_t
 spa_pod_builder_bytes(struct spa_pod_builder *builder, const void *bytes, uint32_t len)
@@ -277,7 +277,7 @@ spa_pod_builder_bytes(struct spa_pod_builder *builder, const void *bytes, uint32
 	return ref;
 }
 
-#define SPA_POD_POINTER_INIT(type,value) { { sizeof(struct spa_pod_pointer_body), SPA_POD_TYPE_POINTER }, { type, value } }
+#define SPA_POD_POINTER_INIT(type,value) (struct spa_pod_pointer){ { sizeof(struct spa_pod_pointer_body), SPA_POD_TYPE_POINTER }, { type, value } }
 
 static inline uint32_t
 spa_pod_builder_pointer(struct spa_pod_builder *builder, uint32_t type, void *val)
@@ -286,7 +286,7 @@ spa_pod_builder_pointer(struct spa_pod_builder *builder, uint32_t type, void *va
 	return spa_pod_builder_primitive(builder, &p.pod);
 }
 
-#define SPA_POD_FD_INIT(fd) { { sizeof(int), SPA_POD_TYPE_FD }, fd }
+#define SPA_POD_FD_INIT(fd) (struct spa_pod_fd){ { sizeof(int), SPA_POD_TYPE_FD }, fd }
 
 static inline uint32_t spa_pod_builder_fd(struct spa_pod_builder *builder, int fd)
 {
@@ -294,7 +294,7 @@ static inline uint32_t spa_pod_builder_fd(struct spa_pod_builder *builder, int f
 	return spa_pod_builder_primitive(builder, &p.pod);
 }
 
-#define SPA_POD_RECTANGLE_INIT(width,height) { { sizeof(struct spa_rectangle), SPA_POD_TYPE_RECTANGLE }, { width, height } }
+#define SPA_POD_RECTANGLE_INIT(width,height) (struct spa_pod_rectangle){ { sizeof(struct spa_rectangle), SPA_POD_TYPE_RECTANGLE }, { width, height } }
 
 static inline uint32_t
 spa_pod_builder_rectangle(struct spa_pod_builder *builder, uint32_t width, uint32_t height)
@@ -303,7 +303,7 @@ spa_pod_builder_rectangle(struct spa_pod_builder *builder, uint32_t width, uint3
 	return spa_pod_builder_primitive(builder, &p.pod);
 }
 
-#define SPA_POD_FRACTION_INIT(num,denom) { { sizeof(struct spa_fraction), SPA_POD_TYPE_FRACTION }, { num, denom } }
+#define SPA_POD_FRACTION_INIT(num,denom) (struct spa_pod_fraction){ { sizeof(struct spa_fraction), SPA_POD_TYPE_FRACTION }, { num, denom } }
 
 static inline uint32_t
 spa_pod_builder_fraction(struct spa_pod_builder *builder, uint32_t num, uint32_t denom)
@@ -337,7 +337,7 @@ spa_pod_builder_array(struct spa_pod_builder *builder,
 	return ref;
 }
 
-#define SPA_POD_STRUCT_INIT(size) { { size, SPA_POD_TYPE_STRUCT } }
+#define SPA_POD_STRUCT_INIT(size) (struct spa_pod_struct){ { size, SPA_POD_TYPE_STRUCT } }
 
 static inline uint32_t
 spa_pod_builder_push_struct(struct spa_pod_builder *builder)
@@ -347,8 +347,7 @@ spa_pod_builder_push_struct(struct spa_pod_builder *builder)
 				    spa_pod_builder_raw(builder, &p, sizeof(p)));
 }
 
-#define SPA_POD_OBJECT_INIT(size,id,type)		{ { size, SPA_POD_TYPE_OBJECT }, { id, type } }
-#define SPA_POD_OBJECT_INIT_COMPLEX(size,id,type,...)	{ { size, SPA_POD_TYPE_OBJECT }, { id, type }, __VA_ARGS__ }
+#define SPA_POD_OBJECT_INIT(size,id,type,...)	(struct spa_pod_object){ { size, SPA_POD_TYPE_OBJECT }, { id, type }, ##__VA_ARGS__ }
 
 static inline uint32_t
 spa_pod_builder_push_object(struct spa_pod_builder *builder, uint32_t id, uint32_t type)
@@ -360,7 +359,7 @@ spa_pod_builder_push_object(struct spa_pod_builder *builder, uint32_t id, uint32
 }
 
 #define SPA_POD_PROP_INIT(size,key,flags,val_size,val_type)	\
-	{ { size, SPA_POD_TYPE_PROP}, {key, flags, { val_size, val_type } } }
+	(struct spa_pod_prop){ { size, SPA_POD_TYPE_PROP}, {key, flags, { val_size, val_type } } }
 
 static inline uint32_t
 spa_pod_builder_push_prop(struct spa_pod_builder *builder, uint32_t key, uint32_t flags)
diff --git a/spa/include/spa/pod/command.h b/spa/include/spa/pod/command.h
index 6d578dab0..2c4289d10 100644
--- a/spa/include/spa/pod/command.h
+++ b/spa/include/spa/pod/command.h
@@ -45,9 +45,9 @@ struct spa_command {
 	{ { sizeof(struct spa_command_body), SPA_POD_TYPE_OBJECT },	\
 	  { { 0, type } } }						\
 
-#define SPA_COMMAND_INIT_COMPLEX(t,size,type,...) (t)			\
+#define SPA_COMMAND_INIT_FULL(t,size,type,...) (t)			\
 	{ { size, SPA_POD_TYPE_OBJECT },				\
-	  { { 0, type }, __VA_ARGS__ } }				\
+	  { { 0, type }, ##__VA_ARGS__ } }				\
 
 #ifdef __cplusplus
 }  /* extern "C" */
diff --git a/spa/include/spa/pod/event.h b/spa/include/spa/pod/event.h
index 8eecf7d75..18444399a 100644
--- a/spa/include/spa/pod/event.h
+++ b/spa/include/spa/pod/event.h
@@ -44,9 +44,9 @@ struct spa_event {
 	{ { sizeof(struct spa_event_body), SPA_POD_TYPE_OBJECT },	\
 	  { { 0, type } } }						\
 
-#define SPA_EVENT_INIT_COMPLEX(t,size,type,...) (t)			\
+#define SPA_EVENT_INIT_FULL(t,size,type,...) (t)			\
 	{ { size, SPA_POD_TYPE_OBJECT },				\
-	  { { 0, type }, __VA_ARGS__ } }				\
+	  { { 0, type }, ##__VA_ARGS__ } }				\
 
 #ifdef __cplusplus
 }  /* extern "C" */
diff --git a/spa/include/spa/pod/pod.h b/spa/include/spa/pod/pod.h
index 7acb85928..5b2d09a6a 100644
--- a/spa/include/spa/pod/pod.h
+++ b/spa/include/spa/pod/pod.h
@@ -101,7 +101,7 @@ struct spa_pod_bool {
 
 struct spa_pod_id {
 	struct spa_pod pod;
-	int32_t value;
+	uint32_t value;
 	int32_t __padding;
 };
 
diff --git a/spa/include/spa/utils/dict.h b/spa/include/spa/utils/dict.h
index e3a814e29..c95e9595d 100644
--- a/spa/include/spa/utils/dict.h
+++ b/spa/include/spa/utils/dict.h
@@ -41,7 +41,7 @@ struct spa_dict {
 	uint32_t n_items;
 };
 
-#define SPA_DICT_INIT(items,n_items) { items, n_items }
+#define SPA_DICT_INIT(items,n_items) (struct spa_dict) { items, n_items }
 
 #define spa_dict_for_each(item, dict)				\
 	for ((item) = (dict)->items;				\
diff --git a/spa/tests/test-control.c b/spa/tests/test-control.c
index c2af9ccb2..24872b827 100644
--- a/spa/tests/test-control.c
+++ b/spa/tests/test-control.c
@@ -368,16 +368,19 @@ static int make_nodes(struct data *data, const char *device)
 				NULL);
 
 		if (propId == data->type.props_freq) {
-			spa_node_port_set_io(data->source,
+			if ((res = spa_node_port_set_io(data->source,
 				     SPA_DIRECTION_OUTPUT, 0,
 				     id,
-				     &data->ctrl_source_freq, sizeof(data->ctrl_source_freq));
+				     &data->ctrl_source_freq, sizeof(data->ctrl_source_freq))) < 0)
+				error(0, -res, "set_io freq");
+
 		}
 		else if (propId == data->type.props_volume) {
-			spa_node_port_set_io(data->source,
+			if ((res = spa_node_port_set_io(data->source,
 				     SPA_DIRECTION_OUTPUT, 0,
 				     id,
-				     &data->ctrl_source_volume, sizeof(data->ctrl_source_volume));
+				     &data->ctrl_source_volume, sizeof(data->ctrl_source_volume))) < 0)
+				error(0, -res, "set_io volume");
 		}
 	}
 
diff --git a/src/extensions/client-node.h b/src/extensions/client-node.h
index 068c3620a..9e35241c6 100644
--- a/src/extensions/client-node.h
+++ b/src/extensions/client-node.h
@@ -137,19 +137,19 @@ struct pw_client_node_message_port_reuse_buffer {
 
 #define PW_CLIENT_NODE_MESSAGE_TYPE(message)	(((struct pw_client_node_message*)(message))->body.type.value)
 
-#define PW_CLIENT_NODE_MESSAGE_INIT(ev) (struct pw_client_node_message) \
-	{ { { sizeof(struct pw_client_node_message_body), SPA_POD_TYPE_STRUCT } },	\
-	  { SPA_POD_INT_INIT(ev) } }
+#define PW_CLIENT_NODE_MESSAGE_INIT(message) (struct pw_client_node_message)			\
+	{ { { sizeof(struct pw_client_node_message_body), SPA_POD_TYPE_STRUCT } },		\
+	  { SPA_POD_INT_INIT(message) } }
 
-#define PW_CLIENT_NODE_MESSAGE_INIT_VA(type,size,message,...) (type)			\
-	{ { { size, SPA_POD_TYPE_STRUCT } },						\
-	  { SPA_POD_INT_INIT(message), __VA_ARGS__ } }					\
+#define PW_CLIENT_NODE_MESSAGE_INIT_FULL(type,size,message,...) (type)				\
+	{ { { size, SPA_POD_TYPE_STRUCT } },							\
+	  { SPA_POD_INT_INIT(message), ##__VA_ARGS__ } }					\
 
-#define PW_CLIENT_NODE_MESSAGE_PORT_REUSE_BUFFER_INIT(port_id,buffer_id)		\
-	PW_CLIENT_NODE_MESSAGE_INIT_VA(struct pw_client_node_message_port_reuse_buffer,	\
-		sizeof(struct pw_client_node_message_port_reuse_buffer_body),		\
-		PW_CLIENT_NODE_MESSAGE_PORT_REUSE_BUFFER,				\
-		SPA_POD_INT_INIT(port_id),						\
+#define PW_CLIENT_NODE_MESSAGE_PORT_REUSE_BUFFER_INIT(port_id,buffer_id)			\
+	PW_CLIENT_NODE_MESSAGE_INIT_FULL(struct pw_client_node_message_port_reuse_buffer,	\
+		sizeof(struct pw_client_node_message_port_reuse_buffer_body),			\
+		PW_CLIENT_NODE_MESSAGE_PORT_REUSE_BUFFER,					\
+		SPA_POD_INT_INIT(port_id),							\
 		SPA_POD_INT_INIT(buffer_id))
 
 /** information about a buffer */
diff --git a/src/pipewire/map.h b/src/pipewire/map.h
index 5872ced84..44b76f850 100644
--- a/src/pipewire/map.h
+++ b/src/pipewire/map.h
@@ -46,7 +46,7 @@ struct pw_map {
 	uint32_t free_list;	/**< the free items */
 };
 
-#define PW_MAP_INIT(extend) { PW_ARRAY_INIT(extend), 0 }
+#define PW_MAP_INIT(extend) (struct pw_map) { PW_ARRAY_INIT(extend), 0 }
 
 #define pw_map_get_size(m)            pw_array_get_len(&(m)->items, union pw_map_item)
 #define pw_map_get_item(m,id)         pw_array_get_unchecked(&(m)->items,id,union pw_map_item)