diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index d24147c59..bc5b6727f 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,5 +1,9 @@
 2001-12-20  Bradford Hovinen  <hovinen@ximian.com>
 
+	* gconf-property-editor.c: Eliminate compiler warnings
+
+	* capplet-util.c: Eliminate compiler warnings
+
 	* gconf-property-editor.c (gconf_peditor_new): Fold the callback
 	back in; accept variable argument list with extra parameters
 	(gconf_peditor_new_filename): Return the property editor
diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c
index bc1e5f15f..d58d28236 100644
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -34,12 +34,6 @@
 
 #include "capplet-util.h"
 
-static CreateDialogFn                 create_dialog_cb = NULL;
-static ApplySettingsFn                apply_settings_cb = NULL;
-static SetupPropertyEditorsFn         setup_property_editors_cb = NULL;
-
-static GConfChangeSet                *changeset;
-
 #if 0
 
 /* apply_cb
diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c
index 2601b3407..85ae4704e 100644
--- a/capplets/common/gconf-property-editor.c
+++ b/capplets/common/gconf-property-editor.c
@@ -198,7 +198,6 @@ gconf_property_editor_set_prop (GObject      *object,
 	GConfPropertyEditor *peditor;
 	GConfClient         *client;
 	GConfNotifyFunc      cb;
-	GObject             *det_obj;
 
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (IS_GCONF_PROPERTY_EDITOR (object));
@@ -298,8 +297,8 @@ gconf_peditor_new (gchar                 *key,
 	GConfClient *client;
 	GConfEntry  *gconf_entry;
 
-	g_return_if_fail (key != NULL);
-	g_return_if_fail (cb != NULL);
+	g_return_val_if_fail (key != NULL, NULL);
+	g_return_val_if_fail (cb != NULL, NULL);
 
 	obj = g_object_new (gconf_property_editor_get_type (),
 			    "key", key,
@@ -736,7 +735,6 @@ peditor_numeric_range_value_changed (GConfClient         *client,
 				     GConfPropertyEditor *peditor) 
 {
 	GConfValue *value, *value_wid;
-	GtkAdjustment *adjustment;
 
 	gconf_change_set_remove (peditor->p->changeset, peditor->p->key);