diff --git a/src/mu-util-db.cc b/src/mu-util-db.cc
index c79f3967..4220e4ba 100644
--- a/src/mu-util-db.cc
+++ b/src/mu-util-db.cc
@@ -54,9 +54,9 @@ gboolean
 mu_util_xapian_set_metadata (const gchar *xpath,
 			     const gchar *key, const gchar *val)
 {
-	g_return_val_if_fail (xpath, NULL);
-	g_return_val_if_fail (key, NULL);
-	g_return_val_if_fail (val, NULL);
+	g_return_val_if_fail (xpath, FALSE);
+	g_return_val_if_fail (key, FALSE);
+	g_return_val_if_fail (val, FALSE);
 	
 	if (!access(xpath, F_OK) == 0) {
 		g_warning ("cannot access %s: %s", xpath, strerror(errno));
diff --git a/toys/mug/mug-msg-list-view.c b/toys/mug/mug-msg-list-view.c
index 2a11b909..9239e9ff 100644
--- a/toys/mug/mug-msg-list-view.c
+++ b/toys/mug/mug-msg-list-view.c
@@ -302,7 +302,7 @@ empty_or_display_contact (const gchar * str)
 }
 
 static MugError
-mu_result_to_mug_error (MuResult r)
+mu_result_to_mug_error (MuError r)
 {
 	switch (r) {
 	case MU_ERROR_XAPIAN_DIR:
diff --git a/toys/mug2/mug-msg-list-view.c b/toys/mug2/mug-msg-list-view.c
index 4c21d8bc..20c92ae7 100644
--- a/toys/mug2/mug-msg-list-view.c
+++ b/toys/mug2/mug-msg-list-view.c
@@ -302,7 +302,7 @@ empty_or_display_contact (const gchar * str)
 }
 
 static MugError
-mu_result_to_mug_error (MuResult r)
+mu_result_to_mug_error (MuError r)
 {
 	switch (r) {
 	case MU_ERROR_XAPIAN_DIR: