diff --git a/gitg/commit/gitg-commit-dialog.vala b/gitg/commit/gitg-commit-dialog.vala
index f5f12f42..ce020a94 100644
--- a/gitg/commit/gitg-commit-dialog.vala
+++ b/gitg/commit/gitg-commit-dialog.vala
@@ -942,7 +942,7 @@ class Dialog : Gtk.Dialog
 							try {
 								file.delete_async.end (res);
 							} catch (Error e) {
-								warning ("Error deleting %S file: %s", PREPARE_COMMIT_MSG_FILENAME, e.message);
+								warning ("Error deleting %s file: %s", PREPARE_COMMIT_MSG_FILENAME, e.message);
 							}
 						});
 					}
diff --git a/gitg/gitg-author-details-dialog.vala b/gitg/gitg-author-details-dialog.vala
index 1680d54b..9e0a028c 100644
--- a/gitg/gitg-author-details-dialog.vala
+++ b/gitg/gitg-author-details-dialog.vala
@@ -205,7 +205,7 @@ namespace Gitg
 							if (exists_local_property(USER_NAME_PROP) || exists_local_property(USER_EMAIL_PROP)) {
 								var alert_dialog = new Gtk.MessageDialog (this, Gtk.DialogFlags.MODAL, Gtk.MessageType.WARNING,
 								                                          Gtk.ButtonsType.OK_CANCEL,
-								                                          _("Disable override will clean existing local author details. Are you sure?"), null);
+								                                          _("Disable override will clean existing local author details. Are you sure?"));
 								alert_dialog.response.connect ((id) => {
 									if (id == Gtk.ResponseType.OK) {
 										delete_local_entry(USER_NAME_PROP);
diff --git a/gitg/gitg-window.vala b/gitg/gitg-window.vala
index 76df26cd..2756e71d 100644
--- a/gitg/gitg-window.vala
+++ b/gitg/gitg-window.vala
@@ -1146,14 +1146,12 @@ public class Window : Gtk.ApplicationWindow, GitgExt.Application, Initable
 
 	public void user_query(GitgExt.UserQuery query)
 	{
-		var dlg = new Gtk.MessageDialog(this,
+		var dlg = new Gtk.MessageDialog.with_markup(this,
 		                                Gtk.DialogFlags.MODAL,
 		                                query.message_type,
 		                                Gtk.ButtonsType.NONE,
-		                                "");
-
-		var primary = "<b>%s</b>".printf(Markup.escape_text(query.title));
-		dlg.set_markup(primary);
+		                                "<b>%s</b>",
+		                                query.title);
 
 		dlg.format_secondary_text("%s", query.message);
 
diff --git a/libgitg/gitg-repository-list-box.vala b/libgitg/gitg-repository-list-box.vala
index 5f2e6de7..ab14df20 100644
--- a/libgitg/gitg-repository-list-box.vala
+++ b/libgitg/gitg-repository-list-box.vala
@@ -569,7 +569,7 @@ namespace Gitg
 		{
 			var alert_dialog = new Gtk.MessageDialog((Gtk.Window) row.get_toplevel(),
 					Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.NONE,
-					_("Deleting repository source files “%s” will delete them from disk and cannot be undone. Are you sure?").printf(uri), null);
+					_("Deleting repository source files “%s” will delete them from disk and cannot be undone. Are you sure?"), uri);
 			alert_dialog.add_button(_("Cancel"), DeleteSources.CANCEL);
 			alert_dialog.add_button(_("Move to trash"), DeleteSources.TRASH);
 			alert_dialog.add_button(_("Delete permanently"), DeleteSources.DELETE);