diff --git a/dbus/dbus-binding-tool-glib.c b/dbus/dbus-binding-tool-glib.c
index e54c8a5..c4605e3 100644
--- a/dbus/dbus-binding-tool-glib.c
+++ b/dbus/dbus-binding-tool-glib.c
@@ -825,12 +825,12 @@ dbus_binding_tool_output_glib_server (BaseInfo *info, GIOChannel *channel, const
   if (error && *error != NULL)
     {
       ret = FALSE;
-      g_io_channel_close (data.channel);
+      g_io_channel_shutdown (data.channel, TRUE, error);
       g_io_channel_unref (data.channel);
       goto io_lose;
     }
 
-  g_io_channel_close (data.channel);
+  g_io_channel_shutdown (data.channel, TRUE, error);
   g_io_channel_unref (data.channel);
   
   /* Now spawn glib-genmarshal to insert all our required marshallers */
@@ -867,7 +867,7 @@ dbus_binding_tool_output_glib_server (BaseInfo *info, GIOChannel *channel, const
   if (iostatus != G_IO_STATUS_EOF)
     goto io_lose;
 
-  g_io_channel_close (genmarshal_stdout);
+  g_io_channel_shutdown (genmarshal_stdout, TRUE, error);
 
   WRITE_OR_LOSE ("#include <dbus/dbus-glib.h>\n");
 
diff --git a/dbus/dbus-gvalue-utils.c b/dbus/dbus-gvalue-utils.c
index 55f58b9..b62ce36 100644
--- a/dbus/dbus-gvalue-utils.c
+++ b/dbus/dbus-gvalue-utils.c
@@ -1309,7 +1309,7 @@ _dbus_gvalue_utils_test (const char *datadir)
     g_assert (g_hash_table_size (instance) == 2);
 
     g_value_init (&val, type);
-    g_value_set_boxed_take_ownership (&val, instance);
+    g_value_take_boxed (&val, instance);
     hashdata.seen_foo = FALSE;
     hashdata.seen_baz = FALSE;
     dbus_g_type_map_value_iterate (&val,
@@ -1335,7 +1335,7 @@ _dbus_gvalue_utils_test (const char *datadir)
 
     instance = dbus_g_type_specialized_construct (type);
     g_value_init (&val, type);
-    g_value_set_boxed_take_ownership (&val, instance);
+    g_value_take_boxed (&val, instance);
 
     dbus_g_type_specialized_init_append (&val, &ctx);
 
@@ -1349,7 +1349,7 @@ _dbus_gvalue_utils_test (const char *datadir)
       eltval = g_new0 (GValue, 1);
       g_value_init (eltval, G_TYPE_UINT);
       g_value_set_uint (eltval, 20);
-      g_value_set_boxed_take_ownership (&valval, eltval);
+      g_value_take_boxed (&valval, eltval);
       dbus_g_type_specialized_map_append (&ctx, &keyval, &valval);
     }
 
@@ -1362,7 +1362,7 @@ _dbus_gvalue_utils_test (const char *datadir)
       eltval = g_new0 (GValue, 1);
       g_value_init (eltval, G_TYPE_STRING);
       g_value_set_string (eltval, "bar");
-      g_value_set_boxed_take_ownership (&valval, eltval);
+      g_value_take_boxed (&valval, eltval);
       dbus_g_type_specialized_map_append (&ctx, &keyval, &valval);
     }
 
@@ -1472,7 +1472,7 @@ _dbus_gvalue_utils_test (const char *datadir)
     g_assert (instance->len == 0);
 
     g_value_init (&val, type);
-    g_value_set_boxed_take_ownership (&val, instance);
+    g_value_take_boxed (&val, instance);
 
     dbus_g_type_specialized_init_append (&val, &ctx);
 
@@ -1515,7 +1515,7 @@ _dbus_gvalue_utils_test (const char *datadir)
     g_assert (instance->n_values == 3);
 
     g_value_init (&val, type);
-    g_value_set_boxed_take_ownership (&val, instance);
+    g_value_take_boxed (&val, instance);
 
     g_value_init (&memval, G_TYPE_STRING);
     g_value_set_static_string (&memval, "foo");
@@ -1568,7 +1568,7 @@ _dbus_gvalue_utils_test (const char *datadir)
     g_assert (instance->n_values == 3);
 
     g_value_init (&val, type);
-    g_value_set_boxed_take_ownership (&val, instance);
+    g_value_take_boxed (&val, instance);
 
     dbus_g_type_struct_set (&val,
                             0,"foo",
diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c
index ef9d7ea..4325011 100644
--- a/dbus/dbus-gvalue.c
+++ b/dbus/dbus-gvalue.c
@@ -642,7 +642,7 @@ demarshal_variant (DBusGValueMarshalCtx    *context,
   if (!demarshal_static_variant (context, iter, variant_val, error))
     return FALSE;
   
-  g_value_set_boxed_take_ownership (value, variant_val);
+  g_value_take_boxed (value, variant_val);
   return TRUE;
 }
 
@@ -671,7 +671,7 @@ demarshal_proxy (DBusGValueMarshalCtx    *context,
   dbus_message_iter_get_basic (iter, &objpath);
 
   new_proxy = dbus_g_proxy_new_from_proxy (context->proxy, NULL, objpath);
-  g_value_set_object_take_ownership (value, new_proxy);
+  g_value_take_object (value, new_proxy);
 
   return TRUE;
 }
@@ -814,7 +814,7 @@ demarshal_strv (DBusGValueMarshalCtx    *context,
       dbus_message_iter_next (&subiter);
     }
 
-  g_value_set_boxed_take_ownership (value, arr->data);
+  g_value_take_boxed (value, arr->data);
   g_array_free (arr, FALSE);
   
   return TRUE;
@@ -879,7 +879,7 @@ demarshal_valuearray (DBusGValueMarshalCtx    *context,
       dbus_message_iter_next (&subiter);
     }
 
-  g_value_set_boxed_take_ownership (value, ret);
+  g_value_take_boxed (value, ret);
   
   return TRUE;
 }
@@ -927,7 +927,7 @@ demarshal_map (DBusGValueMarshalCtx    *context,
   value_gtype = dbus_g_type_get_map_value_specialization (gtype);
 
   ret = dbus_g_type_specialized_construct (gtype);
-  g_value_set_boxed_take_ownership (value, ret);
+  g_value_take_boxed (value, ret);
 
   dbus_g_type_specialized_init_append (value, &appendctx);
 
@@ -991,7 +991,7 @@ demarshal_struct (DBusGValueMarshalCtx    *context,
 
   dbus_message_iter_recurse (iter, &subiter);
 
-  g_value_set_boxed_take_ownership (value,
+  g_value_take_boxed (value,
     dbus_g_type_specialized_construct (G_VALUE_TYPE (value)));
 
   size = dbus_g_type_get_struct_size (G_VALUE_TYPE (value));
@@ -1123,7 +1123,7 @@ demarshal_collection_ptrarray (DBusGValueMarshalCtx    *context,
     }
 
   instance = dbus_g_type_specialized_construct (coltype);
-  g_value_set_boxed_take_ownership (value, instance);
+  g_value_take_boxed (value, instance);
 
   dbus_g_type_specialized_init_append (value, &ctx);
 
@@ -1180,7 +1180,7 @@ demarshal_collection_array (DBusGValueMarshalCtx    *context,
   if (msgarray_len)
     g_array_append_vals (ret, msgarray, (guint) msgarray_len);
 
-  g_value_set_boxed_take_ownership (value, ret);
+  g_value_take_boxed (value, ret);
   
   return TRUE;
 }
diff --git a/test/core/test-dbus-glib.c b/test/core/test-dbus-glib.c
index 1800aa1..69fa0f5 100644
--- a/test/core/test-dbus-glib.c
+++ b/test/core/test-dbus-glib.c
@@ -1399,7 +1399,7 @@ main (int argc, char **argv)
 
     variant = g_new0 (GValue, 1);
     g_value_init (variant, dbus_g_type_get_collection ("GArray", G_TYPE_INT));
-    g_value_set_boxed_take_ownership (variant, array);
+    g_value_take_boxed (variant, array);
 
     if (!dbus_g_proxy_call (proxy, "ProcessVariantOfArrayOfInts123", &error,
                             G_TYPE_VALUE, variant,
diff --git a/test/core/test-thread-client.c b/test/core/test-thread-client.c
index aeec722..985e6d5 100644
--- a/test/core/test-thread-client.c
+++ b/test/core/test-thread-client.c
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
     }
 
   loop = g_main_loop_new (NULL, FALSE);
-  g_main_run (loop);  
+  g_main_loop_run (loop);  
   
   return 0;
 }
diff --git a/test/core/test-thread-server.c b/test/core/test-thread-server.c
index ee54bd9..6c11fa2 100644
--- a/test/core/test-thread-server.c
+++ b/test/core/test-thread-server.c
@@ -203,7 +203,7 @@ main (int argc, char *argv[])
   dbus_server_setup_with_g_main (server, NULL);
   
   loop = g_main_loop_new (NULL, FALSE);
-  g_main_run (loop);  
+  g_main_loop_run (loop);  
 
   return 0;
 }