diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c
index 879e79564..3ee4777aa 100644
--- a/capplets/keyboard/gnome-keyboard-properties.c
+++ b/capplets/keyboard/gnome-keyboard-properties.c
@@ -56,7 +56,8 @@ create_dialog (void)
 static GConfEnumStringPair bell_enums[] = {
 	{ 0, "off" },
 	{ 1, "on" },
-	{ 2, "custom" }
+	{ 2, "custom" },
+	{ -1, NULL }
 };
 
 static GConfValue *
diff --git a/gnome-settings-daemon/gnome-settings-default-editor.c b/gnome-settings-daemon/gnome-settings-default-editor.c
index d1a3e791f..190b37a6c 100644
--- a/gnome-settings-daemon/gnome-settings-default-editor.c
+++ b/gnome-settings-daemon/gnome-settings-default-editor.c
@@ -10,9 +10,9 @@
 /*
  * WARNING: This is a hack.
  *
- * All it does is keep the "text/*" and "text/plain" mime type
+ * All it does is keep the "text / *" and "text/plain" mime type
  * handlers in sync with each other.  The reason we do this is because
- * there is no UI for editing the text/* handler, and this is probably
+ * there is no UI for editing the text / * handler, and this is probably
  * what the user actually wants to do.
  */