diff --git a/doc_src/doc.hdr b/doc_src/doc.hdr
index 8117458c5..04e623df0 100644
--- a/doc_src/doc.hdr
+++ b/doc_src/doc.hdr
@@ -637,7 +637,7 @@ echo $smurf
 \subsection variables-special Special variables
 
 The user can change the settings of \c fish by changing the values of
-certain environment variables. 
+certain environment variables.
 
 - \c BROWSER, which is the users preferred web browser. If this variable is set, fish will use the specified browser instead of the system default browser to display the fish documentation.
 - \c CDPATH, which is an array of directories in which to search for the new directory for the \c cd builtin.
diff --git a/env_universal.c b/env_universal.c
index e31b6cf45..bee57dc23 100644
--- a/env_universal.c
+++ b/env_universal.c
@@ -112,7 +112,7 @@ static int get_socket( int fork_ok )
 	local.sun_family = AF_UNIX;
 	strcpy(local.sun_path, name );
 	free( name );
-	len = strlen(local.sun_path) + sizeof(local.sun_family);
+	len = sizeof(local);
 	
 	if( connect( s, (struct sockaddr *)&local, len) == -1 ) 
 	{
diff --git a/fishd.c b/fishd.c
index 9b29fd20c..595b8a0b5 100644
--- a/fishd.c
+++ b/fishd.c
@@ -174,8 +174,8 @@ static int get_socket()
 	
 	local.sun_family = AF_UNIX;
 	strcpy( local.sun_path, sock_name );
-	len = strlen( local.sun_path ) + sizeof( local.sun_family );
-
+	len = sizeof(local);
+	
 	debug(1, L"Connect to socket at %s", sock_name);
 	
 	if( ( s = socket( AF_UNIX, SOCK_STREAM, 0 ) ) == -1 )
diff --git a/init/fish.in b/init/fish.in
index 54eb0b2e1..53da083f7 100644
--- a/init/fish.in
+++ b/init/fish.in
@@ -49,7 +49,7 @@ end
 # 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
diff --git a/init/fish_function.fish b/init/fish_function.fish
index 5c1c51ff4..cf12180df 100644
--- a/init/fish_function.fish
+++ b/init/fish_function.fish
@@ -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
 
@@ -677,7 +677,7 @@ end
 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