Index: init/fish_interactive.fish.in
===================================================================
--- init/fish_interactive.fish.in	(revision 2)
+++ init/fish_interactive.fish.in	(working copy)
@@ -26,7 +26,7 @@
 # long it is.
 
 function fish_prompt -d "Write out the prompt"
-	printf '%s@%s %s%s%s> \n' (whoami) (hostname|cut -d . -f 1) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+	printf '%s@%s %s%s%s> \n' (whoami) (hostname|cut -d . -f 1) (set_color green) (prompt_pwd) (set_color normal)
 end
 
 #
Index: init/fish_function.fish
===================================================================
--- init/fish_function.fish	(revision 2)
+++ init/fish_function.fish	(working copy)
@@ -6,7 +6,7 @@
 function _contains_help -d "Helper function for contains"
 
 	set bullet \*
-	if expr match "$LANG" ".*UTF" >/dev/null
+	if expr "$LANG" : ".*UTF" >/dev/null
 		set bullet \u2022
 	end
 
@@ -686,7 +686,7 @@
 function __fish_type_help -d "Help for the type shellscript function"
 
 set bullet \*
-if expr match "$LANG" ".*UTF" >/dev/null
+if expr "$LANG" : ".*UTF" >/dev/null
 		set bullet \u2022
 end
 
Index: init/fish.in
===================================================================
--- init/fish.in	(revision 2)
+++ init/fish.in	(working copy)
@@ -49,7 +49,7 @@
 # situation as well?
 #
 
-if expr match "$LANG" ".*UTF" >/dev/null
+if expr "$LANG" : ".*UTF" >/dev/null
 	if test linux = "$TERM"
 		unicode_start ^/dev/null
 	end
Index: reader.c
===================================================================
--- reader.c	(revision 2)
+++ reader.c	(working copy)
@@ -910,14 +910,16 @@
 	  futimes is defined, but it should make the status saving stuff
 	  failsafe.
 	*/
+#if 0
 	struct timeval t=
 		{
 			time(0)-1,
 			0
 		}
 	;
+#endif
 
-	if( futimes( 1, &t ) || futimes( 2, &t ) )
+	if( futimes( 1, NULL ) || futimes( 2, NULL ) )
 	{
 		wperror( L"futimes" );
 	}