diff --git a/Makefile.in b/Makefile.in
index f52b8a405..2f09833da 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,6 +31,8 @@
 # hallucinations.
 #
 
+# Used by docdir
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
 #
 # Programs
@@ -46,6 +48,7 @@ INSTALL:=@INSTALL@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 bindir = @bindir@
 mandir = @mandir@
diff --git a/doc_src/complete.txt b/doc_src/complete.txt
index dfc7cc910..f6d00a154 100644
--- a/doc_src/complete.txt
+++ b/doc_src/complete.txt
@@ -6,7 +6,7 @@
 \subsection complete-description Description
 
 For an introduction to how to specify completions, see the section <a
-href='index.html#completions-own'>Writing your own completions</a> of
+href='index.html#completion-own'>Writing your own completions</a> of
 the fish manual.
 
 - <tt>COMMAND</tt> is the name of the command for which to add a completion
diff --git a/doc_src/fish_indent.txt b/doc_src/fish_indent.txt
index 877290585..68d0647c9 100644
--- a/doc_src/fish_indent.txt
+++ b/doc_src/fish_indent.txt
@@ -1,4 +1,4 @@
-\section fish_indent fish_indent - indenter and prettyfier
+\section fish_indent fish_indent - indenter and prettifier
 
 \subsection fish_indent-synopsis Synopsis
  <tt>fish_indent [options]</tt>
diff --git a/exec.c b/exec.c
index 13fb81b5f..2f5f8e656 100644
--- a/exec.c
+++ b/exec.c
@@ -1575,7 +1575,7 @@ void exec( job_t *j )
 					{
 						debug( 3, L"Set status of %ls to %d using short circut", j->command, p->status );
 
-						int status = proc_format_status(p->status);
+						int status = p->status;
 						proc_set_last_status( job_get_flag( j, JOB_NEGATE )?(!status):status );
 					}
 					break;
diff --git a/parser.c b/parser.c
index 702392b69..36912fa8f 100644
--- a/parser.c
+++ b/parser.c
@@ -2319,8 +2319,12 @@ static void eval_job( tokenizer *tok )
 			j = job_create();
 			job_set_flag( j, JOB_FOREGROUND, 1 );
 			job_set_flag( j, JOB_TERMINAL, job_get_flag( j, JOB_CONTROL ) );
-			job_set_flag( j, JOB_TERMINAL, job_get_flag( j, JOB_CONTROL ) && (!is_subshell && !is_event));
-			job_set_flag( j, JOB_SKIP_NOTIFICATION, is_subshell || is_block || is_event || (!is_interactive));
+			job_set_flag( j, JOB_TERMINAL, job_get_flag( j, JOB_CONTROL ) \
+							               && (!is_subshell && !is_event));
+			job_set_flag( j, JOB_SKIP_NOTIFICATION, is_subshell \
+							                        || is_block \
+													|| is_event \
+													|| (!is_interactive));
 
 			current_block->job = j;
 
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index e2ace3f0c..7ec8215ed 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -150,7 +150,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 		fish_greeting
 	else
 		if set -q fish_greeting
-			switch $fish_greeting
+			switch "$fish_greeting"
 				case ''
 				# If variable is empty, don't print anything, saves us a fork
 
diff --git a/share/functions/eval.fish b/share/functions/eval.fish
index 34c4e3aa3..aec8de27a 100644
--- a/share/functions/eval.fish
+++ b/share/functions/eval.fish
@@ -21,6 +21,8 @@ function eval -S -d "Evaluate parameters as a command"
 	end
 
 	echo begin\; $argv \;end eval2_inner \<\&3 3\<\&- | . 3<&0
+	set -l res $status
 
 	status --job-control $mode
+	return $res
 end
diff --git a/share/functions/help.fish b/share/functions/help.fish
index bd5360026..9531c103e 100644
--- a/share/functions/help.fish
+++ b/share/functions/help.fish
@@ -86,7 +86,7 @@ function help --description "Show help for the fish shell"
 		# documentation.  It's a bit of a hack, since it relies on the
 		# Doxygen markup format to never change.
 
-		case (sed -n < $__fish_help_dir/commands.html -e "s/.*<h2><a class=\"anchor\" name=\"\([^\"]*\)\">.*/\1/p")
+		case (sed -n 's/.*<h2><a class="anchor" \(id\|name\)="\([^"]*\)">.*/\2/p' $__fish_help_dir/commands.html)
 			set fish_help_page "commands.html\#$fish_help_item"
 		case $help_topics
 			set fish_help_page "index.html\#$fish_help_item"
diff --git a/tests/test1.in b/tests/test1.in
index 3b3ba25f3..ff3ef7788 100644
--- a/tests/test1.in
+++ b/tests/test1.in
@@ -1,5 +1,5 @@
 #
-#Test aliases loops and conditionals
+#Test aliases, loops, conditionals and some basic elements
 #
 
 for i in 1 2 #Comment on same line as command
@@ -51,3 +51,25 @@ for i in Test for continue break and switch builtins problems;
 	end
 end
 
+set -l sta
+if eval true
+	if eval false
+		set sta fail
+	else
+		set sta pass
+	end
+else
+	set sta fail
+end
+echo Test 4 $sta
+
+function test_builtin_status
+	return 1
+end
+test_builtin_status
+if [ $status -eq 1 ]
+	set sta pass
+else
+	set sta fail
+end
+echo Test 5 $sta
diff --git a/tests/test1.out b/tests/test1.out
index 64b65faa5..f20a722f0 100644
--- a/tests/test1.out
+++ b/tests/test1.out
@@ -5,3 +5,5 @@
 Test 2 pass
 Test  pass
 Test 3 pass
+Test 4 pass
+Test 5 pass