diff --git a/atk/atkhyperlink.c b/atk/atkhyperlink.c
index ae2e2e76b0eff9af0b6fdc7a177167438ed62e50..7faaeb8cc59e93dba069848ada135947402e4f7e 100644
--- a/atk/atkhyperlink.c
+++ b/atk/atkhyperlink.c
@@ -219,7 +219,7 @@ atk_hyperlink_real_get_property (GObject    *object,
  *
  * Multiple anchors are primarily used by client-side image maps.
  *
- * Returns: a string specifying the URI 
+ * Returns: (transfer full) (nullable): a string specifying the URI 
  **/
 gchar*
 atk_hyperlink_get_uri (AtkHyperlink *link,
@@ -248,7 +248,7 @@ atk_hyperlink_get_uri (AtkHyperlink *link,
  * 
  * Multiple anchors are primarily used by client-side image maps.
  *
- * Returns: (transfer none): an #AtkObject associated with this hyperlinks
+ * Returns: (transfer none) (nullable): an #AtkObject associated with this hyperlinks
  * i-th anchor
  **/
 AtkObject*
diff --git a/atk/atkhyperlinkimpl.c b/atk/atkhyperlinkimpl.c
index 7021bcf63cff55d1d319ea85abe78ebe79017c88..f197a76dac6c9161dd4664e03eaa7b4b32bc0b8d 100644
--- a/atk/atkhyperlinkimpl.c
+++ b/atk/atkhyperlinkimpl.c
@@ -84,7 +84,7 @@ atk_hyperlink_impl_get_type (void)
  *
  * Gets the hyperlink associated with this object.
  *
- * Returns: (transfer full):  an AtkHyperlink object which points to this
+ * Returns: (transfer full) (nullable): an AtkHyperlink object which points to this
  * implementing AtkObject.
  *
  * Since: 1.12
diff --git a/atk/atkimage.c b/atk/atkimage.c
index 3a7bdc78a2fe47f9d97750e92d1d2e37e061354d..2d39e235c26ffb826341d7956cff69f75d44143c 100644
--- a/atk/atkimage.c
+++ b/atk/atkimage.c
@@ -67,7 +67,7 @@ atk_image_get_type (void)
  *
  * Get a textual description of this image.
  *
- * Returns: a string representing the image description
+ * Returns: (transfer none) (nullable): a string representing the image description
  **/
 const gchar*
 atk_image_get_image_description (AtkImage *image)
@@ -220,7 +220,7 @@ atk_image_get_image_position (AtkImage *image,
  *
  * Since: 1.12
  *
- * Returns: (nullable): a string corresponding to the POSIX
+ * Returns: (transfer none) (nullable): a string corresponding to the POSIX
  *   `LC_MESSAGES` locale used by the image description, or
  *   %NULL if the image does not specify a locale.
  *
diff --git a/atk/atkmisc.c b/atk/atkmisc.c
index cd59a079ce82e2a0c15508096e6659608c8caad5..f7b33980cd3c8438909812c0e75c0abcd7d3b03a 100644
--- a/atk/atkmisc.c
+++ b/atk/atkmisc.c
@@ -139,7 +139,7 @@ AtkMisc *atk_misc_instance = NULL;
  *
  * Deprecated: Since 2.12.
  *
- * Returns: The singleton instance of AtkMisc for this application.
+ * Returns: (transfer none): The singleton instance of AtkMisc for this application.
  *
  **/
 const AtkMisc *
diff --git a/atk/atkobject.c b/atk/atkobject.c
index 63986dd9d8fd00ccd71885f5b0874bf7beef3b8d..a9e5463abc8f43bac0e0af81f1fbe8aead8d7334 100644
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -725,7 +725,7 @@ atk_implementor_get_type (void)
  *
  * Gets the accessible name of the accessible.
  *
- * Returns: a character string representing the accessible name of the object.
+ * Returns: (transfer none): a character string representing the accessible name of the object.
  **/
 const gchar*
 atk_object_get_name (AtkObject *accessible)
@@ -747,7 +747,7 @@ atk_object_get_name (AtkObject *accessible)
  *
  * Gets the accessible description of the accessible.
  *
- * Returns: a character string representing the accessible description
+ * Returns: (transfer none): a character string representing the accessible description
  * of the accessible.
  *
  **/
@@ -778,7 +778,7 @@ atk_object_get_description (AtkObject *accessible)
  * If you are only interested on the parent assigned with
  * atk_object_set_parent(), use atk_object_peek_parent().
  *
- * Returns: (transfer none): an #AtkObject representing the accessible
+ * Returns: (transfer none) (nullable): an #AtkObject representing the accessible
  * parent of the accessible
  **/
 AtkObject*
@@ -807,7 +807,7 @@ atk_object_get_parent (AtkObject *accessible)
  * to be exposed to accessible tools. See atk_object_get_parent() for
  * further reference.
  *
- * Returns: (transfer none): an #AtkObject representing the accessible
+ * Returns: (transfer none) (nullable): an #AtkObject representing the accessible
  * parent of the accessible if assigned
  **/
 AtkObject*
@@ -848,7 +848,7 @@ atk_object_get_n_accessible_children (AtkObject *accessible)
  * The accessible children are 0-based so the first accessible child is
  * at index 0, the second at index 1 and so on.
  *
- * Returns: (transfer full): an #AtkObject representing the specified
+ * Returns: (transfer full) (nullable): an #AtkObject representing the specified
  * accessible child of the accessible.
  **/
 AtkObject*
@@ -1575,7 +1575,7 @@ atk_object_notify (GObject     *obj,
  *
  * Gets the description string describing the #AtkRole @role.
  *
- * Returns: the string describing the AtkRole
+ * Returns: (transfer none) (nullable): the string describing the AtkRole
  */
 const gchar*
 atk_role_get_name (AtkRole role)
@@ -1597,7 +1597,7 @@ atk_role_get_name (AtkRole role)
  *
  * Gets the localized description string describing the #AtkRole @role.
  *
- * Returns: the localized string describing the AtkRole
+ * Returns: (transfer none): the localized string describing the AtkRole
  **/
 const gchar*
 atk_role_get_localized_name (AtkRole role)
@@ -1622,7 +1622,7 @@ atk_object_real_get_object_locale (AtkObject *object)
  *
  * Since: 2.8
  *
- * Returns: a UTF-8 string indicating the POSIX-style LC_MESSAGES
+ * Returns: (transfer none): a UTF-8 string indicating the POSIX-style LC_MESSAGES
  *          locale of @accessible.
  **/
 const gchar*
@@ -1751,8 +1751,8 @@ atk_object_remove_relationship (AtkObject       *object,
  *
  * Since: 2.34
  *
- * Returns: a character string representing the accessible id of the object, or
- * NULL if no such string was set.
+ * Returns: (transfer none) (nullable): a character string representing the
+ * accessible id of the object, or NULL if no such string was set.
  **/
 const gchar*
 atk_object_get_accessible_id (AtkObject *accessible)
diff --git a/atk/atkobjectfactory.c b/atk/atkobjectfactory.c
index 298f3c240b91430317f15914ddec388e1f0b5140..733eb8f7767b982197b12f65f12007bcad5faef8 100644
--- a/atk/atkobjectfactory.c
+++ b/atk/atkobjectfactory.c
@@ -72,7 +72,7 @@ atk_object_factory_class_init (AtkObjectFactoryClass *klass)
 }
 
 /**
- * atk_object_factory_create_accessible:
+ * atk_object_factory_create_accessible: constructor
  * @factory: The #AtkObjectFactory associated with @obj's
  * object type
  * @obj: a #GObject 
diff --git a/atk/atkplug.c b/atk/atkplug.c
index ddd86ed0f0ec57f403f2c2624edbee7421916670..875dd770fd0702b98976328ca4a015bcaa43e51e 100644
--- a/atk/atkplug.c
+++ b/atk/atkplug.c
@@ -116,7 +116,7 @@ atk_component_interface_init (AtkComponentIface *iface)
 }
 
 /**
- * atk_plug_new:
+ * atk_plug_new: (constructor)
  *
  * Creates a new #AtkPlug instance.
  *
@@ -174,7 +174,7 @@ atk_plug_set_child (AtkPlug *plug, AtkObject *child)
  * loaded) and pass the value to the process implementing the
  * #AtkSocket, so it could embed the plug.
  *
- * Returns: the unique ID for the plug
+ * Returns: (transfer full): the unique ID for the plug
  *
  * Since: 1.30
  **/
diff --git a/atk/atkrange.c b/atk/atkrange.c
index bb69ca5ca12382c67871271e49e2eeea648e7a28..b1675c9c58c871297bf6009716286a24cec9035b 100644
--- a/atk/atkrange.c
+++ b/atk/atkrange.c
@@ -42,7 +42,7 @@ struct _AtkRange {
 };
 
 /**
- * atk_range_copy:
+ * atk_range_copy: (constructor)
  * @src: #AtkRange to copy
  *
  * Returns a new #AtkRange that is a exact copy of @src
@@ -85,7 +85,7 @@ G_DEFINE_BOXED_TYPE (AtkRange, atk_range, atk_range_copy,
 
 
 /**
- * atk_range_new:
+ * atk_range_new: (constructor)
  * @lower_limit: inferior limit for this range
  * @upper_limit: superior limit for this range
  * @description: human readable description of this range.
@@ -158,7 +158,7 @@ atk_range_get_upper_limit (AtkRange *range)
  *
  * Since: 2.12
  *
- * Returns: the human-readable description of @range
+ * Returns: (transfer none) (nullable): the human-readable description of @range
  */
 const gchar*
 atk_range_get_description  (AtkRange *range)
diff --git a/atk/atkregistry.c b/atk/atkregistry.c
index 45fabdebdb0045a34932485b892ebb5ed5fb4793..617810738e69e15b59342aa71c64b66fbb0c9996 100644
--- a/atk/atkregistry.c
+++ b/atk/atkregistry.c
@@ -250,7 +250,7 @@ atk_registry_get_factory (AtkRegistry *registry,
 }
 
 /**
- * atk_get_default_registry:
+ * atk_get_default_registry: (constructor)
  *
  * Gets a default implementation of the #AtkObjectFactory/type
  * registry.
diff --git a/atk/atkrelationset.c b/atk/atkrelationset.c
index 95d50e66b905af27cdf6ca7cd2d3d8d9dd14d5ae..af130710f8a2385f7e09aa9de461b521f9dae0b5 100644
--- a/atk/atkrelationset.c
+++ b/atk/atkrelationset.c
@@ -79,11 +79,11 @@ atk_relation_set_class_init (AtkRelationSetClass *klass)
 }
 
 /**
- * atk_relation_set_new:
+ * atk_relation_set_new: (constructor)
  * 
  * Creates a new empty relation set.
  * 
- * Returns: a new #AtkRelationSet 
+ * Returns: (transfer full): a new #AtkRelationSet 
  **/
 AtkRelationSet*
 atk_relation_set_new (void)
@@ -240,7 +240,7 @@ atk_relation_set_get_n_relations (AtkRelationSet *set)
  *
  * Determines the relation at the specified position in the relation set.
  *
- * Returns: (transfer none): a #AtkRelation, which is the relation at
+ * Returns: (transfer none) (nullable): a #AtkRelation, which is the relation at
  * position i in the set.
  **/
 AtkRelation*
@@ -270,7 +270,7 @@ atk_relation_set_get_relation (AtkRelationSet *set,
  *
  * Finds a relation that matches the specified type.
  *
- * Returns: (transfer none): an #AtkRelation, which is a relation matching the
+ * Returns: (transfer none) (nullable): an #AtkRelation, which is a relation matching the
  * specified type.
  **/
 AtkRelation*
diff --git a/atk/atkstateset.c b/atk/atkstateset.c
index d240ee6e10fc8ce7699f8ab965adde15ae40a86a..c3f7f3b676abf75e7c863f0dfd3641baaac4b934 100644
--- a/atk/atkstateset.c
+++ b/atk/atkstateset.c
@@ -77,11 +77,11 @@ atk_state_set_class_init (AtkStateSetClass *klass)
 }
 
 /**
- * atk_state_set_new:
+ * atk_state_set_new: (constructor)
  * 
  * Creates a new empty state set.
  * 
- * Returns: a new #AtkStateSet 
+ * Returns: (transfer full): a new #AtkStateSet 
  **/
 AtkStateSet*
 atk_state_set_new (void)
@@ -284,7 +284,7 @@ atk_state_set_remove_state (AtkStateSet  *set,
  * Constructs the intersection of the two sets, returning %NULL if the
  * intersection is empty.
  *
- * Returns: (transfer full): a new #AtkStateSet which is the intersection of
+ * Returns: (transfer full) (nullable): a new #AtkStateSet which is the intersection of
  * the two sets.
  **/
 AtkStateSet*
@@ -354,7 +354,7 @@ atk_state_set_or_sets (AtkStateSet  *set,
  * The set returned by this operation contains the states in exactly
  * one of the two sets.
  *
- * Returns: (transfer full): a new #AtkStateSet which contains the states
+ * Returns: (transfer full) (nullable): a new #AtkStateSet which contains the states
  * which are in exactly one of the two sets.
  **/
 AtkStateSet*
diff --git a/atk/atkstreamablecontent.c b/atk/atkstreamablecontent.c
index 571ca2b6a13ed2e5d89e3690c6acbdc4c6d572ea..762c95ce5bceb1953980d3440db50a741c2bc35f 100644
--- a/atk/atkstreamablecontent.c
+++ b/atk/atkstreamablecontent.c
@@ -96,7 +96,7 @@ atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable)
  * Gets the character string of the specified mime type. The first mime
  * type is at position 0, the second at position 1, and so on.
  *
- * Returns: a gchar* representing the specified mime type; the caller
+ * Returns: (transfer none): a gchar* representing the specified mime type; the caller
  * should not free the character string.
  **/
 const gchar*
@@ -158,7 +158,7 @@ atk_streamable_content_get_stream (AtkStreamableContent *streamable,
  * Note that it is possible for get_uri to return NULL but for
  * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
  *
- * Returns: (nullable): Returns a string representing a URI, or %NULL
+ * Returns: (transfer none) (nullable): Returns a string representing a URI, or %NULL
  * if no corresponding URI can be constructed.
  *
  * Since: 1.12
diff --git a/atk/atktable.c b/atk/atktable.c
index 082de56d15e03ecdae4c9aa0d9f8fef859b7bb0a..9cfc54087398edc988a53f3bf8203d22004f5a0d 100644
--- a/atk/atktable.c
+++ b/atk/atktable.c
@@ -238,7 +238,7 @@ atk_table_base_init (gpointer *g_class)
  * Get a reference to the table cell at @row, @column. This cell
  * should implement the interface #AtkTableCell
  *
- * Returns: (transfer full): an #AtkObject representing the referred
+ * Returns: (transfer full) (nullable): an #AtkObject representing the referred
  * to accessible
  **/
 AtkObject*
@@ -406,7 +406,7 @@ atk_table_get_n_columns (AtkTable *table)
  *
  * Gets the description text of the specified @column in the table
  *
- * Returns: a gchar* representing the column description, or %NULL
+ * Returns: (transfer none) (nullable): a gchar* representing the column description, or %NULL
  * if value does not implement this interface.
  **/
 const gchar*
@@ -511,7 +511,7 @@ atk_table_get_n_rows (AtkTable *table)
  *
  * Gets the description text of the specified row in the table
  *
- * Returns: (nullable): a gchar* representing the row description, or
+ * Returns: (transfer none) (nullable): a gchar* representing the row description, or
  * %NULL if value does not implement this interface.
  **/
 const gchar*
diff --git a/atk/atktext.c b/atk/atktext.c
index ef489fc1720da0531690c78942137d5ef40bae4b..e471b9d0e65173a9e87ed542e5c36a7b91c91654 100644
--- a/atk/atktext.c
+++ b/atk/atktext.c
@@ -784,7 +784,7 @@ atk_text_get_run_attributes (AtkText          *text,
 }
 
 /**
- * atk_text_get_default_attributes:
+ * atk_text_get_default_attributes: (constructor)
  *@text: an #AtkText
  *
  *Creates an #AtkAttributeSet which consists of the default values of
@@ -904,7 +904,7 @@ atk_text_get_n_selections (AtkText *text)
  *
  * Gets the text from the specified selection.
  *
- * Returns: a newly allocated string containing the selected text. Use g_free()
+ * Returns: (transfer full): a newly allocated string containing the selected text. Use g_free()
  *          to free the returned string.
  **/
 gchar*
@@ -1132,7 +1132,7 @@ atk_text_get_range_extents (AtkText          *text,
  *
  * Since: 1.3
  *
- * Returns: (array zero-terminated=1): Array of AtkTextRange. The last
+ * Returns: (transfer none) (array zero-terminated=1): Array of AtkTextRange. The last
  *          element of the array returned by this function will be NULL.
  **/
 AtkTextRange**
@@ -1209,7 +1209,7 @@ atk_text_attribute_register (const gchar *name)
  *
  * Gets the name corresponding to the #AtkTextAttribute
  *
- * Returns: a string containing the name; this string should not be freed
+ * Returns: (transfer none): a string containing the name; this string should not be freed
  **/
 const gchar*
 atk_text_attribute_get_name (AtkTextAttribute attr)
@@ -1304,7 +1304,7 @@ atk_text_attribute_for_name (const gchar *name)
  *
  * Gets the value for the index of the #AtkTextAttribute
  *
- * Returns: (nullable): a string containing the value; this string
+ * Returns: (transfer none) (nullable): a string containing the value; this string
  * should not be freed; %NULL is returned if there are no values
  * maintained for the attr value.
  **/