diff --git a/src/ctl/wfd-dbus.c b/src/ctl/wfd-dbus.c
index d5030b0..d1ab36a 100644
--- a/src/ctl/wfd-dbus.c
+++ b/src/ctl/wfd-dbus.c
@@ -252,9 +252,7 @@ int _wfd_dbus_object_added(struct wfd_dbus *wfd_dbus,
 int wfd_fn_sink_new(struct wfd_sink *s)
 {
 	_shl_free_ char *path = NULL;
-	int r = sd_bus_path_encode("/org/freedesktop/miracle/wfd/sink",
-					wfd_sink_get_label(s),
-					&path);
+	int r = wfd_dbus_get_sink_path(s, &path);
 	if(0 > r) {
 		return r;
 	}
@@ -265,9 +263,7 @@ int wfd_fn_sink_new(struct wfd_sink *s)
 int wfd_fn_sink_free(struct wfd_sink *s)
 {
 	_shl_free_ char *path = NULL;
-	int r = sd_bus_path_encode("/org/freedesktop/miracle/wfd/sink",
-					wfd_sink_get_label(s),
-					&path);
+	int r = wfd_dbus_get_sink_path(s, &path);
 	if(0 > r) {
 		return r;
 	}
diff --git a/src/ctl/wfdctl.c b/src/ctl/wfdctl.c
index 7c4c04e..9c9931c 100644
--- a/src/ctl/wfdctl.c
+++ b/src/ctl/wfdctl.c
@@ -57,7 +57,7 @@ int ctl_wfd_new(struct ctl_wfd **out, sd_event *loop, sd_bus *bus)
 	}
 
 	shl_htable_init_str(&wfd->sinks);
-	shl_htable_init_u64(&wfd->sessions);
+	shl_htable_init_uint(&wfd->sessions);
 	wfd->loop = sd_event_ref(loop);
 
 	r = ctl_wfd_init(wfd, bus);
@@ -85,7 +85,7 @@ static void ctl_wfd_free(struct ctl_wfd *wfd)
 	ctl_wifi_free(wfd->wifi);
 	wfd->wifi = NULL;
 	shl_htable_clear_str(&wfd->sinks, NULL, NULL);
-	shl_htable_clear_u64(&wfd->sessions, NULL, NULL);
+	shl_htable_clear_uint(&wfd->sessions, NULL, NULL);
 
 	for(i = 0; i < SHL_ARRAY_LENGTH(wfd->signal_sources); ++ i) {
 		if(wfd->signal_sources[i]) {