diff --git a/gio/ChangeLog b/gio/ChangeLog
index 4dc738fb5..0a3435a9e 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-27  Alexander Larsson  <alexl@redhat.com>
+
+        * gcontenttype.c:
+	Fix type warnings
+	
+        * gunixvolume.c:
+        (g_unix_volume_mount):
+	Add missing GMountMountFlags argument
+
 2008-02-26  Alexander Larsson  <alexl@redhat.com>
 
         * glocalfile.c:
diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index a813ec7f0..69949a2d3 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -644,16 +644,17 @@ g_content_type_get_mime_type (const char *type)
 GIcon *
 g_content_type_get_icon (const char *type)
 {
-  char *mimetype_icon, *generic_mimetype_icon, *p;
+  char *mimetype_icon, *generic_mimetype_icon, *q;
   char *icon_names[3];
-  GThemedIcon *themed_icon;
+  const char *p;
+  GIcon *themed_icon;
   
   g_return_val_if_fail (type != NULL, NULL);
   
   mimetype_icon = g_strdup (type);
   
-  while ((p = strchr (mimetype_icon, '/')) != NULL)
-    *p = '-';
+  while ((q = strchr (mimetype_icon, '/')) != NULL)
+    *q = '-';
   
   p = strchr (type, '/');
   if (p == NULL)
@@ -675,7 +676,7 @@ g_content_type_get_icon (const char *type)
   g_free (icon_names[1]);
   g_free (generic_mimetype_icon);
   
-  return G_ICON (themed_icon);
+  return themed_icon;
 }
 
 /**
diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c
index 0b9f16a69..7f8cbc14b 100644
--- a/gio/gunixvolume.c
+++ b/gio/gunixvolume.c
@@ -391,6 +391,7 @@ eject_mount_do (GVolume             *volume,
 
 static void
 g_unix_volume_mount (GVolume    *volume,
+                     GMountMountFlags    flags,
                      GMountOperation     *mount_operation,
                      GCancellable        *cancellable,
                      GAsyncReadyCallback  callback,