diff --git a/tests/shell.c b/tests/shell.c
index 9e0d67f0..16d7e87c 100644
--- a/tests/shell.c
+++ b/tests/shell.c
@@ -8,7 +8,7 @@ typedef struct
 	GitgRepository *repository;
 } RepositoryInfo;
 
-static gboolean
+static void
 remove_all (gchar const *path,
             GError      **error)
 {
diff --git a/tools/gitg-shell.c b/tools/gitg-shell.c
index 16ae3124..3ee76e07 100644
--- a/tools/gitg-shell.c
+++ b/tools/gitg-shell.c
@@ -1,4 +1,5 @@
 #include <glib.h>
+#include <string.h>
 #include <stdlib.h>
 #include <libgitg/gitg-shell.h>
 #include <gio/gunixinputstream.h>
@@ -96,7 +97,7 @@ main (int argc, char *argv[])
 
 	gitg_debug_init ();
 
-	if (i == 1)
+	if (argc == 1)
 	{
 		g_print ("Please specify a command...\n");
 		return 1;