diff --git a/Makefile.in b/Makefile.in
index 70f0ff2cd..d770102f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -773,7 +773,7 @@ mimedb: $(MIME_OBJS)
 # Build the set_color program
 #
 
-set_color: set_color.o print_help.o common.o color.o
+set_color: set_color.o print_help.o common.o color.o wutil.o
 	$(CXX) set_color.o print_help.o common.o wutil.o color.o $(LDFLAGS_SET_COLOR) -o $@
 
 
diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish
index a26387d40..b62da166e 100644
--- a/share/functions/fish_default_key_bindings.fish
+++ b/share/functions/fish_default_key_bindings.fish
@@ -31,8 +31,10 @@ function fish_default_key_bindings -d "Default (Emacs-like) key bindings for fis
 
 	bind \e\[H beginning-of-line
 	bind \e\[F end-of-line
-	bind -k home beginning-of-line
-	bind -k end end-of-line
+
+	# OS X SnowLeopard doesn't have these keys. Don't show an annoying error message.
+	bind -k home beginning-of-line 2> /dev/null
+	bind -k end end-of-line 2> /dev/null
 
 	bind \e\eOC nextd-or-forward-word
 	bind \e\eOD prevd-or-backward-word