diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index ad90698367..c14d8c9690 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -2329,10 +2329,9 @@ nm_client_class_init (NMClientClass *client_class)
 		                       G_PARAM_STATIC_STRINGS));
 
 	/**
-	 * NMClient:active-connections:
+	 * NMClient:active-connections: (type GPtrArray):
 	 *
 	 * The active connections.
-	 * Type: GLib.PtrArray
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_ACTIVE_CONNECTIONS,
diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c
index 4acdeae76e..e446280f1d 100644
--- a/libnm-glib/nm-dhcp4-config.c
+++ b/libnm-glib/nm-dhcp4-config.c
@@ -148,11 +148,9 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class)
 	/* properties */
 
 	/**
-	 * NMDHCP4Config:options:
+	 * NMDHCP4Config:options: (type GHashTable(utf8,GObject.Value)):
 	 *
 	 * The #GHashTable containing options of the configuration.
-	 *
-	 * Type: GLib.HashTable(utf8,GObject.Value)
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_OPTIONS,
diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c
index aebea8df6a..c35fb3ba9b 100644
--- a/libnm-glib/nm-dhcp6-config.c
+++ b/libnm-glib/nm-dhcp6-config.c
@@ -148,11 +148,9 @@ nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class)
 	/* properties */
 
 	/**
-	 * NMDHCP6Config:options:
+	 * NMDHCP6Config:options: (type GHashTable(utf8,GObject.Value)):
 	 *
 	 * The #GHashTable containing options of the configuration.
-	 *
-	 * Type: GLib.HashTable(utf8,GObject.Value)
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_OPTIONS,
diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index 75129e06f8..69c81d072b 100644
--- a/libnm-glib/nm-secret-agent.c
+++ b/libnm-glib/nm-secret-agent.c
@@ -695,7 +695,7 @@ auto_register_cb (gpointer user_data)
 /*****************************************************************************/
 
 /**
- * nm_secret_agent_get_secrets:
+ * nm_secret_agent_get_secrets: (virtual get_secrets):
  * @self: a #NMSecretAgent
  * @connection: the #NMConnection for which we're asked secrets
  * @setting_name: the name of the secret setting
@@ -709,8 +709,6 @@ auto_register_cb (gpointer user_data)
  * agent should use when performing the request, for example returning only
  * existing secrets without user interaction, or requesting entirely new
  * secrets from the user.
- *
- * Virtual: get_secrets
  */
 void
 nm_secret_agent_get_secrets (NMSecretAgent *self,
@@ -739,7 +737,7 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
 }
 
 /**
- * nm_secret_agent_save_secrets:
+ * nm_secret_agent_save_secrets: (virtual save_secrets):
  * @self: a #NMSecretAgent
  * @connection: a #NMConnection
  * @callback: (scope async): a callback, to be invoked when the operation is done
@@ -747,8 +745,6 @@ nm_secret_agent_get_secrets (NMSecretAgent *self,
  *
  * Asyncronously ensure that all secrets inside @connection
  * are stored to disk.
- *
- * Virtual: save_secrets
  */
 void
 nm_secret_agent_save_secrets (NMSecretAgent *self,
@@ -768,7 +764,7 @@ nm_secret_agent_save_secrets (NMSecretAgent *self,
 }
 
 /**
- * nm_secret_agent_delete_secrets:
+ * nm_secret_agent_delete_secrets: (virtual delete_secrets):
  * @self: a #NMSecretAgent
  * @connection: a #NMConnection
  * @callback: (scope async): a callback, to be invoked when the operation is done
@@ -776,8 +772,6 @@ nm_secret_agent_save_secrets (NMSecretAgent *self,
  *
  * Asynchronously ask the agent to delete all saved secrets belonging to
  * @connection.
- *
- * Virtual: delete_secrets
  */
 void
 nm_secret_agent_delete_secrets (NMSecretAgent *self,