diff --git a/src/dmabuf.rs b/src/dmabuf.rs
index a947b58ca..6661e8a4a 100644
--- a/src/dmabuf.rs
+++ b/src/dmabuf.rs
@@ -19,7 +19,7 @@ type dev_t = u64;
 use libc::dev_t;
 
 /// A preference tranche of dmabuf formats
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct DmabufFeedbackTranche {
     /// `dev_t` value for preferred target device. May be scan-out or
     /// renderer device.
@@ -43,6 +43,7 @@ impl Default for DmabufFeedbackTranche {
 /// A single dmabuf format/modifier pair
 // Must have correct representation to be able to mmap format table
 #[repr(C)]
+#[derive(Copy, Clone)]
 pub struct DmabufFormat {
     /// Fourcc format
     pub format: u32,
diff --git a/src/globals.rs b/src/globals.rs
index 6b16c6d5d..bb9f5648b 100644
--- a/src/globals.rs
+++ b/src/globals.rs
@@ -7,13 +7,13 @@ use wayland_client::Proxy;
 /// argument.  For example:
 ///
 /// - A global that binds to `wl_compositor` with maximum version 4 could implement
-/// `ProvidesBoundGlobal<WlCompositor, 4>`, `ProvidesBoundGlobal<WlCompositor, 3>`,
-/// `ProvidesBoundGlobal<WlCompositor, 2>`, and `ProvidesBoundGlobal<WlCompositor, 1>` because
-/// versions 2-4 only add additional requests to the `wl_surface` API.
+///   `ProvidesBoundGlobal<WlCompositor, 4>`, `ProvidesBoundGlobal<WlCompositor, 3>`,
+///   `ProvidesBoundGlobal<WlCompositor, 2>`, and `ProvidesBoundGlobal<WlCompositor, 1>` because
+///   versions 2-4 only add additional requests to the `wl_surface` API.
 /// - A global that binds to `wl_compositor` with maximum version 5 may only implement
-/// `ProvidesBoundGlobal<WlCompositor, 5>` because version 5 makes using `wl_surface::attach` with
-/// a nonzero offset a protocol error.  A caller who is only aware of the version 4 API risks
-/// causing these protocol errors if it uses surfaces created by such a global.
+///   `ProvidesBoundGlobal<WlCompositor, 5>` because version 5 makes using `wl_surface::attach` with
+///   a nonzero offset a protocol error.  A caller who is only aware of the version 4 API risks
+///   causing these protocol errors if it uses surfaces created by such a global.
 ///
 /// Changes that cause compatibility breaks include:
 ///