diff --git a/src/ifs/ext_idle_notifier_v1.rs b/src/ifs/ext_idle_notifier_v1.rs
index ed29440e..ffba3c70 100644
--- a/src/ifs/ext_idle_notifier_v1.rs
+++ b/src/ifs/ext_idle_notifier_v1.rs
@@ -71,6 +71,7 @@ impl ExtIdleNotifierV1RequestHandler for ExtIdleNotifierV1 {
             duration_usec: (req.timeout as u64).max(1000).saturating_mul(1000),
             version: self.version,
         });
+        track!(self.client, notification);
         self.client.add_client_obj(&notification)?;
         let future = self.client.state.eng.spawn(run(notification.clone()));
         notification.task.set(Some(future));
diff --git a/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs b/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs
index 2230408d..98a2025f 100644
--- a/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs
+++ b/src/ifs/wl_seat/zwp_pointer_constraints_v1.rs
@@ -226,6 +226,7 @@ impl ZwpPointerConstraintsV1RequestHandler for ZwpPointerConstraintsV1 {
             constraint,
             version: self.version,
         });
+        track!(self.client, lp);
         self.client.add_client_obj(&lp)?;
         lp.constraint.owner.set(Some(lp.clone()));
         lp.constraint
@@ -250,6 +251,7 @@ impl ZwpPointerConstraintsV1RequestHandler for ZwpPointerConstraintsV1 {
             constraint,
             version: self.version,
         });
+        track!(self.client, lp);
         self.client.add_client_obj(&lp)?;
         lp.constraint.owner.set(Some(lp.clone()));
         lp.constraint
diff --git a/src/ifs/wl_seat/zwp_pointer_gestures_v1.rs b/src/ifs/wl_seat/zwp_pointer_gestures_v1.rs
index 4c3fc766..a7f76c67 100644
--- a/src/ifs/wl_seat/zwp_pointer_gestures_v1.rs
+++ b/src/ifs/wl_seat/zwp_pointer_gestures_v1.rs
@@ -79,6 +79,7 @@ impl ZwpPointerGesturesV1RequestHandler for ZwpPointerGesturesV1 {
             tracker: Default::default(),
             version: self.version,
         });
+        track!(self.client, obj);
         self.client.add_client_obj(&obj)?;
         seat.swipe_bindings.add(&self.client, &obj);
         Ok(())
@@ -93,6 +94,7 @@ impl ZwpPointerGesturesV1RequestHandler for ZwpPointerGesturesV1 {
             tracker: Default::default(),
             version: self.version,
         });
+        track!(self.client, obj);
         self.client.add_client_obj(&obj)?;
         seat.pinch_bindings.add(&self.client, &obj);
         Ok(())
@@ -112,6 +114,7 @@ impl ZwpPointerGesturesV1RequestHandler for ZwpPointerGesturesV1 {
             tracker: Default::default(),
             version: self.version,
         });
+        track!(self.client, obj);
         self.client.add_client_obj(&obj)?;
         seat.hold_bindings.add(&self.client, &obj);
         Ok(())
diff --git a/src/ifs/wp_alpha_modifier_v1.rs b/src/ifs/wp_alpha_modifier_v1.rs
index ea88381a..36e0dacf 100644
--- a/src/ifs/wp_alpha_modifier_v1.rs
+++ b/src/ifs/wp_alpha_modifier_v1.rs
@@ -61,7 +61,7 @@ impl WpAlphaModifierV1RequestHandler for WpAlphaModifierV1 {
             &surface,
             self.version,
         ));
-        track!(self.client, surface);
+        track!(self.client, modifier);
         self.client.add_client_obj(&modifier)?;
         modifier.install()?;
         Ok(())
diff --git a/src/ifs/wp_drm_lease_device_v1.rs b/src/ifs/wp_drm_lease_device_v1.rs
index 3ad2ed5f..c6abc93d 100644
--- a/src/ifs/wp_drm_lease_device_v1.rs
+++ b/src/ifs/wp_drm_lease_device_v1.rs
@@ -123,6 +123,7 @@ impl WpDrmLeaseDeviceV1 {
             connector_id: output.connector.connector.id(),
             bindings: output.lease_connectors.clone(),
         });
+        track!(self.client, obj);
         self.client.add_server_obj(&obj);
         self.send_connector(&obj);
         obj.send_name(&output.connector.name);
@@ -172,6 +173,7 @@ impl WpDrmLeaseDeviceV1RequestHandler for WpDrmLeaseDeviceV1 {
             device: self.device,
             connectors: Default::default(),
         });
+        track!(self.client, obj);
         self.client.add_client_obj(&obj)?;
         Ok(())
     }
diff --git a/src/ifs/wp_drm_lease_request_v1.rs b/src/ifs/wp_drm_lease_request_v1.rs
index 70c95c18..e942bb0a 100644
--- a/src/ifs/wp_drm_lease_request_v1.rs
+++ b/src/ifs/wp_drm_lease_request_v1.rs
@@ -46,6 +46,7 @@ impl WpDrmLeaseRequestV1RequestHandler for WpDrmLeaseRequestV1 {
             finished: Cell::new(false),
             lease: Default::default(),
         });
+        track!(self.client, obj);
         self.client.add_client_obj(&obj)?;
         if self.connectors.is_empty() {
             return Err(WpDrmLeaseRequestV1Error::EmptyLease);
diff --git a/src/ifs/wp_linux_drm_syncobj_manager_v1.rs b/src/ifs/wp_linux_drm_syncobj_manager_v1.rs
index 5b08571f..dda9467b 100644
--- a/src/ifs/wp_linux_drm_syncobj_manager_v1.rs
+++ b/src/ifs/wp_linux_drm_syncobj_manager_v1.rs
@@ -99,6 +99,7 @@ impl WpLinuxDrmSyncobjManagerV1RequestHandler for WpLinuxDrmSyncobjManagerV1 {
             &sync_obj,
             self.version,
         ));
+        track!(self.client, sync);
         self.client.add_client_obj(&sync)?;
         Ok(())
     }