diff --git a/parser.c b/parser.c
index 1d3303658..8514faa8c 100644
--- a/parser.c
+++ b/parser.c
@@ -2810,7 +2810,7 @@ int parser_test( const  wchar_t * buff,
 	int needs_cmd=0; 
 	void *context = halloc( 0, 0 );
 	int arg_count=0;
-	wchar_t *cmd;
+	wchar_t *cmd=0;
 		
 	current_tokenizer = &tok;
 
diff --git a/reader.c b/reader.c
index 2b40702da..efb86579a 100644
--- a/reader.c
+++ b/reader.c
@@ -2082,7 +2082,7 @@ void reader_run_command( wchar_t *cmd )
 
 	term_steal();
 
-	env_set( L"_", L"fish", ENV_GLOBAL );
+	env_set( L"_", program_name, ENV_GLOBAL );
 
 #ifdef HAVE__PROC_SELF_STAT
 	proc_update_jiffies();