diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index 0ab9bcac2..732c5f489 100644
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -10319,7 +10319,8 @@ _clutter_actor_get_stage_internal (ClutterActor *actor)
  *
  * Retrieves the #ClutterStage where @actor is contained.
  *
- * Return value: (transfer none): the stage containing the actor, or %NULL
+ * Return value: (transfer none) (type Clutter.Actor): the stage
+ *   containing the actor, or %NULL
  *
  * Since: 0.8
  */
diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h
index 832d901af..bdeeda5b9 100644
--- a/clutter/clutter-actor.h
+++ b/clutter/clutter-actor.h
@@ -77,7 +77,7 @@ typedef struct _ClutterActorPrivate  ClutterActorPrivate;
 /**
  * ClutterCallback:
  * @actor: a #ClutterActor
- * @data: user data
+ * @data: (closure): user data
  *
  * Generic callback
  */
diff --git a/clutter/clutter-behaviour-path.c b/clutter/clutter-behaviour-path.c
index f283928ca..8b271f50f 100644
--- a/clutter/clutter-behaviour-path.c
+++ b/clutter/clutter-behaviour-path.c
@@ -377,7 +377,7 @@ clutter_behaviour_path_new_with_description (ClutterAlpha *alpha,
 /**
  * clutter_behaviour_path_new_with_knots:
  * @alpha: (allow-none): a #ClutterAlpha instance, or %NULL
- * @knots: an array of #ClutterKnot<!-- -->s
+ * @knots: (array length=n_knots): an array of #ClutterKnot<!-- -->s
  * @n_knots: number of entries in @knots
  *
  * Creates a new path behaviour that will make the actors visit all of
diff --git a/clutter/clutter-behaviour-rotate.c b/clutter/clutter-behaviour-rotate.c
index 40ede6bcd..faeb30cd7 100644
--- a/clutter/clutter-behaviour-rotate.c
+++ b/clutter/clutter-behaviour-rotate.c
@@ -545,8 +545,8 @@ clutter_behaviour_rotate_set_direction (ClutterBehaviourRotate *rotate,
 /**
  * clutter_behaviour_rotate_get_bounds:
  * @rotate: a #ClutterBehaviourRotate
- * @angle_start: return value for the initial angle
- * @angle_end: return value for the final angle
+ * @angle_start: (out): return value for the initial angle
+ * @angle_end: (out): return value for the final angle
  *
  * Retrieves the rotation boundaries of the rotate behaviour.
  *
diff --git a/clutter/clutter-behaviour.h b/clutter/clutter-behaviour.h
index 7f7ddf0b3..32a596f6b 100644
--- a/clutter/clutter-behaviour.h
+++ b/clutter/clutter-behaviour.h
@@ -68,7 +68,7 @@ typedef struct _ClutterBehaviourClass   ClutterBehaviourClass;
  * ClutterBehaviourForeachFunc:
  * @behaviour: the #ClutterBehaviour
  * @actor: an actor driven by @behaviour
- * @data: optional data passed to the function
+ * @data: (closure): optional data passed to the function
  *
  * This function is passed to clutter_behaviour_actors_foreach() and
  * will be called for each actor driven by @behaviour.
diff --git a/clutter/clutter-container.c b/clutter/clutter-container.c
index 11776c10f..6b1bb715b 100644
--- a/clutter/clutter-container.c
+++ b/clutter/clutter-container.c
@@ -490,7 +490,8 @@ clutter_container_foreach_with_internals (ClutterContainer *container,
  * clutter_container_raise_child:
  * @container: a #ClutterContainer
  * @actor: the actor to raise
- * @sibling: the sibling to raise to, or %NULL to raise to the top
+ * @sibling: (allow-none): the sibling to raise to, or %NULL to raise
+ *   to the top
  *
  * Raises @actor to @sibling level, in the depth ordering.
  *
@@ -545,7 +546,8 @@ clutter_container_raise_child (ClutterContainer *container,
  * clutter_container_lower_child:
  * @container: a #ClutterContainer
  * @actor: the actor to raise
- * @sibling: the sibling to lower to, or %NULL to lower to the bottom
+ * @sibling: (allow-none): the sibling to lower to, or %NULL to lower
+ *   to the bottom
  *
  * Lowers @actor to @sibling level, in the depth ordering.
  *
diff --git a/clutter/clutter-path.h b/clutter/clutter-path.h
index ab04fac08..2351e58e0 100644
--- a/clutter/clutter-path.h
+++ b/clutter/clutter-path.h
@@ -83,7 +83,7 @@ typedef struct _ClutterPathNode    ClutterPathNode;
 /**
  * ClutterPathCallback:
  * @node: the node
- * @data: optional data passed to the function
+ * @data: (closure): optional data passed to the function
  *
  * This function is passed to clutter_path_foreach() and will be
  * called for each node contained in the path.
diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c
index b964b7a54..5808d027a 100644
--- a/clutter/clutter-script.c
+++ b/clutter/clutter-script.c
@@ -1172,7 +1172,8 @@ clutter_script_error_quark (void)
 /**
  * clutter_script_add_search_paths:
  * @script: a #ClutterScript
- * @paths: an array of strings containing different search paths
+ * @paths: (array length=n_paths): an array of strings containing
+ *   different search paths
  * @n_paths: the length of the passed array
  *
  * Adds @paths to the list of search paths held by @script.
diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c
index 7e9beb389..fe0298471 100644
--- a/clutter/clutter-stage.c
+++ b/clutter/clutter-stage.c
@@ -2113,8 +2113,9 @@ clutter_stage_init (ClutterStage *self)
  *
  * Clutter guarantess the existence of the default stage.
  *
- * Return value: (transfer none): the main #ClutterStage.  You should never
- *   destroy or unref the returned actor.
+ * Return value: (transfer none) (type Clutter.Stage): the main
+ *   #ClutterStage.  You should never destroy or unref the returned
+ *   actor.
  */
 ClutterActor *
 clutter_stage_get_default (void)
@@ -3042,7 +3043,7 @@ clutter_stage_set_fog (ClutterStage *stage,
 /**
  * clutter_stage_get_fog:
  * @stage: the #ClutterStage
- * @fog: return location for a #ClutterFog structure
+ * @fog: (out): return location for a #ClutterFog structure
  *
  * Retrieves the current depth cueing settings from the stage.
  *
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
index cea4a3c73..2e8723960 100644
--- a/clutter/clutter-text.c
+++ b/clutter/clutter-text.c
@@ -3555,7 +3555,7 @@ clutter_text_new_full (const gchar        *font_name,
 
 /**
  * clutter_text_new_with_text:
- * @font_name: a string with a font description
+ * @font_name: (allow-none): a string with a font description
  * @text: the contents of the actor
  *
  * Creates a new #ClutterText actor, using @font_name as the font
@@ -3863,7 +3863,7 @@ clutter_text_set_cursor_color (ClutterText        *self,
 /**
  * clutter_text_get_cursor_color:
  * @self: a #ClutterText
- * @color: return location for a #ClutterColor
+ * @color: (out): return location for a #ClutterColor
  *
  * Retrieves the color of the cursor of a #ClutterText actor.
  *