diff --git a/src/ctl/wfd-arg.inc b/src/ctl/wfd-arg.inc
index 76b88b6..6579961 100644
--- a/src/ctl/wfd-arg.inc
+++ b/src/ctl/wfd-arg.inc
@@ -25,7 +25,7 @@ static inline _t wfd_arg_get_##_s(const struct wfd_arg *a) \
 }
 
 #define wfd_arg_setter(_t, _s, _S) \
-static inline void wfd_arg_set_##_t(struct wfd_arg *a, _t v)		\
+static inline void wfd_arg_set_##_s(struct wfd_arg *a, _t v)		\
 {																	\
 	assert(a);														\
 	assert(!a->type || WFD_ARG_##_S == a->type);					\
diff --git a/src/ctl/wfdctl.c b/src/ctl/wfdctl.c
index 575fd94..921f40e 100644
--- a/src/ctl/wfdctl.c
+++ b/src/ctl/wfdctl.c
@@ -314,7 +314,8 @@ void ctl_fn_peer_new(struct ctl_peer *p)
 	union wfd_sube sube;
 	int r;
 
-	log_debug("new peer %s shows up: '%s'",
+	log_debug("new peer %s (%s) shows up, wfd_subelems: '%s'",
+					p->friendly_name,
 					p->label,
 					p->wfd_subelements);