diff --git a/src/core/prefs.c b/src/core/prefs.c
index be1645ddf..f62665389 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -2854,7 +2854,6 @@ meta_prefs_set_clutter_plugins (GSList *list)
 void
 meta_prefs_override_clutter_plugins (GSList *list)
 {
-  GError *err = NULL;
   GSList *l;
 
   clutter_plugins_overridden = TRUE;
diff --git a/src/core/schema-bindings.c b/src/core/schema-bindings.c
index 77a428996..915dca38f 100644
--- a/src/core/schema-bindings.c
+++ b/src/core/schema-bindings.c
@@ -138,12 +138,16 @@ produce_bindings ()
       fprintf (target_file, "%s", buffer);
 
   if (fclose (source_file)!=0)
+    {
       g_error ("Cannot close %s: %s\n",
         source_filename, strerror (errno));
-
+    }
+  
   if (fclose (target_file)!=0)
+    {
       g_error ("Cannot close %s: %s\n",
         target_filename, strerror (errno));
+    }
 }
 
 int
diff --git a/src/metacity.schemas.in.in b/src/metacity.schemas.in.in
index b3a0ec407..a7bbfab14 100644
--- a/src/metacity.schemas.in.in
+++ b/src/metacity.schemas.in.in
@@ -354,6 +354,53 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/metacity/general/clutter_disabled</key>
+      <applyto>/apps/metacity/general/clutter_disabled</applyto>
+      <owner>metacity</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Clutter Disabled</short>
+        <long>
+          Determines whether Clutter compositing backend should be disabled.
+          Change to this option will not take effect until Metacity is
+          restarted.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/metacity/general/clutter_plugins</key>
+      <applyto>/apps/metacity/general/clutter_plugins</applyto>
+      <owner>metacity</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <default>[default]</default>
+      <locale name="C">
+        <short>Clutter Plugins</short>
+        <long>
+          Plugins to load for the Clutter-based compositing manager.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/metacity/general/live_hidden_windows</key>
+      <applyto>/apps/metacity/general/live_hidden_windows</applyto>
+      <owner>metacity</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Live Hidden Windows</short>
+        <long>
+          Determines whether hidden windows (i.e., minimized windows and
+          windows on other workspaces than the current one) should be kept
+          alive.
+        </long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/apps/metacity/workspace_names/name</key>
       <applyto>/apps/metacity/workspace_names/name_1</applyto>