diff --git a/mkinstalldirs b/mkinstalldirs
index d2d5f21b..4191a45d 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,21 +1,36 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
 
+scriptversion=2009-04-28.21; # UTC
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+IFS=" ""	$nl"
 errstatus=0
-dirmode=""
+dirmode=
 
 usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
 
 # process command line arguments
 while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
+      echo "$usage"
+      exit $?
       ;;
     -m)                         # -m PERM arg
       shift
@@ -23,6 +38,10 @@ while test $# -gt 0 ; do
       dirmode=$1
       shift
       ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit $?
+      ;;
     --)                         # stop option processing
       shift
       break
@@ -50,30 +69,58 @@ case $# in
   0) exit 0 ;;
 esac
 
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
   '')
-    if mkdir -p -- . 2>/dev/null; then
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
     fi
     ;;
   *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
     fi
     ;;
 esac
 
 for file
 do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
   shift
+  IFS=$oIFS
 
-  pathcomp=
   for d
   do
-    pathcomp="$pathcomp$d"
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
     case $pathcomp in
       -*) pathcomp=./$pathcomp ;;
     esac
@@ -84,21 +131,21 @@ do
       mkdir "$pathcomp" || lasterr=$?
 
       if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
+	errstatus=$lasterr
       else
-  	if test ! -z "$dirmode"; then
+	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+	  lasterr=
+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
+	  if test ! -z "$lasterr"; then
+	    errstatus=$lasterr
+	  fi
+	fi
       fi
     fi
 
-    pathcomp="$pathcomp/"
+    pathcomp=$pathcomp/
   done
 done
 
@@ -107,5 +154,9 @@ exit $errstatus
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
-# mkinstalldirs ends here
diff --git a/src/callback_func.c b/src/callback_func.c
index 9059d117..b4eb5abd 100644
--- a/src/callback_func.c
+++ b/src/callback_func.c
@@ -66,51 +66,47 @@ callback_show_next_live_game(void)
 
     for(i=0;i<ligs->len;i++) {
 	for(j=0;j<lig(i).fixtures->len;j++) {
-            // Store the player order before the live match: get the team that is involved, if it's a user team
-            // and that user has the option to always store the default team checked, store it
-            user_team_involved = fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j));
-            if (user_team_involved!=-1 && option_int("int_opt_user_store_restore_default_team",
-			  &usr(user_team_involved).options)) {
-                store_default_team(&usr(user_team_involved));
-            }
-            
+            user_team_involved = fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j));            
 	    if(g_array_index(lig(i).fixtures, Fixture, j).week_number == week &&
 	       g_array_index(lig(i).fixtures, Fixture, j).week_round_number == week_round &&
 	       fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j)) != -1 &&
-	       g_array_index(lig(i).fixtures, Fixture, j).attendance == -1 &&
-	       option_int("int_opt_user_show_live_game",
+	       g_array_index(lig(i).fixtures, Fixture, j).attendance == -1 ) {
+                // Store the player order before the live match: get the team that is involved, if it's a user team
+                // and that user has the option to always store the default team checked, store it
+                if (option_int("int_opt_user_store_restore_default_team", &usr(user_team_involved).options)) {
+                    store_default_team(&usr(user_team_involved));
+                }
+                if (option_int("int_opt_user_show_live_game",
 			  &usr(fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j))).
-			  options))
-	    {
-		live_game_calculate_fixture(&g_array_index(lig(i).fixtures, Fixture, j), 
-                                            &usr(fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j))).live_game);
-		return;
+			  options)) {
+		    live_game_calculate_fixture(&g_array_index(lig(i).fixtures, Fixture, j), 
+                                                &usr(fixture_user_team_involved(&g_array_index(lig(i).fixtures, Fixture, j))).live_game);
+		    return;
+                }
 	    }
         }
     }
 
     for(i=0;i<acps->len;i++) {
         for(j=0;j<acp(i)->fixtures->len;j++) {
-            // Store the player order before the live match: get the team that is involved, if it's a user team
-            // and that user has the option to always store the default team checked, store it
             user_team_involved = fixture_user_team_involved(&g_array_index(acp(i)->fixtures, Fixture, j));
-
-            if (user_team_involved!=-1 && option_int("int_opt_user_store_restore_default_team",
-			  &usr(user_team_involved).options)) {
-                store_default_team(&usr(user_team_involved));
-            }
-
 	    if(g_array_index(acp(i)->fixtures, Fixture, j).week_number == week &&
 	       g_array_index(acp(i)->fixtures, Fixture, j).week_round_number == week_round &&
 	       fixture_user_team_involved(&g_array_index(acp(i)->fixtures, Fixture, j)) != -1 &&
-	       g_array_index(acp(i)->fixtures, Fixture, j).attendance == -1 &&
-	       option_int("int_opt_user_show_live_game",
-			  &usr(fixture_user_team_involved(&g_array_index(acp(i)->fixtures, Fixture, j))).
-			  options))
+	       g_array_index(acp(i)->fixtures, Fixture, j).attendance == -1)
 	    {
-		live_game_calculate_fixture(&g_array_index(acp(i)->fixtures, Fixture, j), 
-                                            &usr(fixture_user_team_involved(&g_array_index(acp(i)->fixtures, Fixture, j))).live_game);
- 		return;
+                // Store the player order before the live match: get the team that is involved, if it's a user team
+                // and that user has the option to always store the default team checked, store it
+                if (option_int("int_opt_user_store_restore_default_team", &usr(user_team_involved).options)) {
+                    store_default_team(&usr(user_team_involved));
+                }
+                if (option_int("int_opt_user_show_live_game",
+			  &usr(fixture_user_team_involved(&g_array_index(acp(i)->fixtures, Fixture, j))).
+			  options)) {
+		    live_game_calculate_fixture(&g_array_index(acp(i)->fixtures, Fixture, j), 
+                                                &usr(fixture_user_team_involved(&g_array_index(acp(i)->fixtures, Fixture, j))).live_game);
+ 		    return;
+                }
 	    }
         }
     }
diff --git a/src/user.c b/src/user.c
index e78c6393..5142b79d 100644
--- a/src/user.c
+++ b/src/user.c
@@ -1360,7 +1360,7 @@ restore_default_team(User *user)
         player1 = g_array_index(user->default_team, gint, i);
         player2 = g_array_index(user->tm->players, Player, i).id;
         if (player1 != player2) {
-            // We don't want to stop because a player has been romoved from your team
+            // We don't want to stop because a player has been removed from your team
             player1_index = player_id_index(user->tm,player1, FALSE);
             player2_index = player_id_index(user->tm,player2, FALSE);
             if (player1_index==-1 || player2_index==-1) {