Index: thunar-vfs-xfer.c
===================================================================
--- thunar-vfs-xfer.c	(revision 20276)
+++ thunar-vfs-xfer.c	(working copy)
@@ -135,12 +135,12 @@
 static gboolean
 tvxc_mounted_readonly (const gchar *path)
 {
-#if defined(HAVE_STATFS) && !defined(__sgi__)
+#if defined(HAVE_STATVFS)
+  struct statvfs statvfsb;
+  return (statvfs (path, &statvfsb) == 0 && (statvfsb.f_flag & ST_RDONLY) != 0);
+#elif defined(HAVE_STATFS)
   struct statfs statfsb;
   return (statfs (path, &statfsb) == 0 && (statfsb.f_flags & MNT_RDONLY) != 0);
-#elif defined(HAVE_STATVFS)
-  struct statvfs statvfsb;
-  return (statvfs (path, &statvfsb) == 0 && (statvfsb.f_flag & ST_RDONLY) != 0);
 #else
   return FALSE;
 #endif
Index: thunar-vfs-mime-legacy.c
===================================================================
--- thunar-vfs-mime-legacy.c	(revision 20276)
+++ thunar-vfs-mime-legacy.c	(working copy)
@@ -1071,7 +1071,7 @@
   bytes_read = fread (buffer, 1, matchlet->value_length, fp);
   if (bytes_read != matchlet->value_length)
     return feof (fp) ? THUNAR_VFS_MIME_LEGACY_MAGIC_EOF : THUNAR_VFS_MIME_LEGACY_MAGIC_ERROR;
-  matchlet->value = g_string_chunk_insert_len (legacy->string_chunk, buffer, matchlet->value_length);
+  matchlet->value = (guchar *) g_string_chunk_insert_len (legacy->string_chunk, buffer, matchlet->value_length);
 
   c = getc_unlocked (fp);
   if (c == '&')
@@ -1081,7 +1081,7 @@
       if (bytes_read != matchlet->value_length)
         return feof (fp) ? THUNAR_VFS_MIME_LEGACY_MAGIC_EOF : THUNAR_VFS_MIME_LEGACY_MAGIC_ERROR;
 
-      matchlet->mask = g_string_chunk_insert_len (legacy->string_chunk, buffer, matchlet->value_length);
+      matchlet->mask = (guchar *) g_string_chunk_insert_len (legacy->string_chunk, buffer, matchlet->value_length);
 
       c = getc_unlocked (fp);
     }