Index: config/fish/functions/fish_right_prompt.fish
==================================================================
--- config/fish/functions/fish_right_prompt.fish
+++ config/fish/functions/fish_right_prompt.fish
@@ -1,16 +1,15 @@
 function fish_right_prompt
 	set -l code $status
 	set -l jobs (jobs | wc -l)
-
-	if test $jobs -gt 0
-		set_color $fish_color_jobs
-		echo "$jobs "
-	end
-
-	if test $code -gt 0
-		set_color $fish_color_error
-		echo "$code "
-	end
+	set -l prompt
+
+	test $jobs -gt 0
+	and set -a prompt (set_color $fish_color_jobs)$jobs
+
+	test $code -gt 0
+	and set -a prompt (set_color $fish_color_error)$code
+
+	echo $prompt
 
 	set_color normal
 end

Index: config/fish/functions/make.fish
==================================================================
--- config/fish/functions/make.fish
+++ config/fish/functions/make.fish
@@ -1,10 +1,11 @@
 # Automatically use bmake instead of make when using pkgsrc
 function make
 	if which bmake >/dev/null ^&1 && \
 	    string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
 		# pkgsrc does not like MAKEFLAGS including -j
-		env MAKEFLAGS= bmake $argv
+		set -lx MAKEFLAGS
+		command bmake $argv
 	else
 		command make $argv
 	end
 end