diff --git a/libfwupdplugin/fu-chunk.c b/libfwupdplugin/fu-chunk.c
index ebc453ba0..a4b39a6d9 100644
--- a/libfwupdplugin/fu-chunk.c
+++ b/libfwupdplugin/fu-chunk.c
@@ -114,7 +114,7 @@ fu_chunk_array_to_string (GPtrArray *chunks)
  * Chunks a linear blob of memory into packets, ensuring each packet does not
  * cross a package boundary and is less that a specific transfer size.
  *
- * Return value: (element-type FuChunk): array of packets
+ * Return value: (transfer container) (element-type FuChunk): array of packets
  *
  * Since: 1.1.2
  **/
@@ -197,7 +197,7 @@ fu_chunk_array_new (const guint8 *data,
  * Chunks a linear blob of memory into packets, ensuring each packet does not
  * cross a package boundary and is less that a specific transfer size.
  *
- * Return value: (element-type FuChunk): array of packets
+ * Return value: (transfer container) (element-type FuChunk): array of packets
  *
  * Since: 1.1.2
  **/
diff --git a/libfwupdplugin/fu-common.c b/libfwupdplugin/fu-common.c
index d80834423..7ad33f8be 100644
--- a/libfwupdplugin/fu-common.c
+++ b/libfwupdplugin/fu-common.c
@@ -121,7 +121,7 @@ fu_common_get_file_list_internal (GPtrArray *files, const gchar *directory, GErr
  * If any path under @directory cannot be accessed due to permissions an error
  * will be returned.
  *
- * Returns: (transfer container): array of files, or %NULL for error
+ * Returns: (transfer container) (element-type utf8): array of files, or %NULL for error
  *
  * Since: 1.0.6
  **/
@@ -1671,7 +1671,7 @@ fu_common_fnmatch (const gchar *pattern, const gchar *str)
  * delimiter. If @max_tokens is reached, the remainder of string is appended
  * to the last token.
  *
- * Return value: a newly-allocated NULL-terminated array of strings
+ * Return value: (transfer full): a newly-allocated NULL-terminated array of strings
  *
  * Since: 1.3.1
  **/
diff --git a/libfwupdplugin/fu-device.c b/libfwupdplugin/fu-device.c
index 6f507a2f6..8dd90733a 100644
--- a/libfwupdplugin/fu-device.c
+++ b/libfwupdplugin/fu-device.c
@@ -150,7 +150,7 @@ fu_device_set_property (GObject *object, guint prop_id,
  *
  * Gets the list of possible plugin names, typically added from quirk files.
  *
- * Returns: (element-type utf-8) (transfer container): plugin names
+ * Returns: (element-type utf8) (transfer container): plugin names
  *
  * Since: 1.3.3
  **/
diff --git a/libfwupdplugin/fu-hwids.c b/libfwupdplugin/fu-hwids.c
index f587620d1..11fb1c088 100644
--- a/libfwupdplugin/fu-hwids.c
+++ b/libfwupdplugin/fu-hwids.c
@@ -68,7 +68,7 @@ fu_hwids_has_guid (FuHwids *self, const gchar *guid)
  *
  * Returns all the defined HWIDs
  *
- * Returns: (transfer none) (element-type utf-8): An array of GUIDs
+ * Returns: (transfer none) (element-type utf8): An array of GUIDs
  *
  * Since: 0.9.3
  **/
diff --git a/libfwupdplugin/fu-io-channel.c b/libfwupdplugin/fu-io-channel.c
index f69fd1955..cdaa08be8 100644
--- a/libfwupdplugin/fu-io-channel.c
+++ b/libfwupdplugin/fu-io-channel.c
@@ -271,7 +271,7 @@ fu_io_channel_read_bytes (FuIOChannel *self,
  *
  * Reads bytes from the TTY, that will fail if exceeding @timeout_ms.
  *
- * Returns: a #GByteArray, or %NULL for error
+ * Returns: (transfer full): a #GByteArray, or %NULL for error
  *
  * Since: 1.3.2
  **/
diff --git a/libfwupdplugin/fu-plugin.c b/libfwupdplugin/fu-plugin.c
index 919693fd1..ab84bae73 100644
--- a/libfwupdplugin/fu-plugin.c
+++ b/libfwupdplugin/fu-plugin.c
@@ -763,7 +763,7 @@ fu_plugin_set_hwids (FuPlugin *self, FuHwids *hwids)
 /**
  * fu_plugin_set_udev_subsystems:
  * @self: A #FuPlugin
- * @udev_subsystems: A #GPtrArray
+ * @udev_subsystems: (element-type utf8): A #GPtrArray
  *
  * Sets the udev subsystems used by a plugin
  *
@@ -1440,7 +1440,7 @@ fu_plugin_runner_coldplug_cleanup (FuPlugin *self, GError **error)
 /**
  * fu_plugin_runner_composite_prepare:
  * @self: a #FuPlugin
- * @devices: a #GPtrArray of devices
+ * @devices: (element-type FuDevice): a #GPtrArray of devices
  * @error: a #GError or NULL
  *
  * Runs the composite_prepare routine for the plugin
@@ -1460,7 +1460,7 @@ fu_plugin_runner_composite_prepare (FuPlugin *self, GPtrArray *devices, GError *
 /**
  * fu_plugin_runner_composite_cleanup:
  * @self: a #FuPlugin
- * @devices: a #GPtrArray of devices
+ * @devices: (element-type FuDevice): a #GPtrArray of devices
  * @error: a #GError or NULL
  *
  * Runs the composite_cleanup routine for the plugin
diff --git a/libfwupdplugin/fu-quirks.h b/libfwupdplugin/fu-quirks.h
index 40c01d297..db985ffbc 100644
--- a/libfwupdplugin/fu-quirks.h
+++ b/libfwupdplugin/fu-quirks.h
@@ -40,7 +40,7 @@ const gchar	*fu_quirks_lookup_by_id			(FuQuirks	*self,
 							 const gchar	*key);
 gboolean	 fu_quirks_lookup_by_id_iter		(FuQuirks	*self,
 							 const gchar	*group,
-							 FuQuirksIter	 iter,
+							 FuQuirksIter	 iter_cb,
 							 gpointer	 user_data);
 
 #define	FU_QUIRKS_PLUGIN			"Plugin"
diff --git a/libfwupdplugin/fu-usb-device.c b/libfwupdplugin/fu-usb-device.c
index 3bce0015d..56eb15f8d 100644
--- a/libfwupdplugin/fu-usb-device.c
+++ b/libfwupdplugin/fu-usb-device.c
@@ -430,11 +430,11 @@ fu_usb_device_set_dev (FuUsbDevice *device, GUsbDevice *usb_device)
 /**
  * fu_usb_device_find_udev_device:
  * @device: A #FuUsbDevice
- * @usb_device: A #GUsbDevice, or %NULL
+ * @error: A #GError, or %NULL
  *
  * Gets the matching #GUdevDevice for the #GUsbDevice.
  *
- * Returns: a #GUdevDevice, or NULL if unset or invalid
+ * Returns: (transfer full): a #GUdevDevice, or NULL if unset or invalid
  *
  * Since: 1.3.2
  **/