diff --git a/SConstruct b/SConstruct
index 552910a39..4032508ab 100644
--- a/SConstruct
+++ b/SConstruct
@@ -94,7 +94,7 @@ if os.name == 'nt':
             extraEnvArgs['MSVC_VERSION'] = pickCompilerEnv['msvc_version']
 
     elif pickCompilerEnv['toolchain'] == 'mingw':
-        toolchain = ['mingw']
+        toolchain = ['mingw', 'f90']
         extraEnvArgs['F77'] = None
         # Next line fixes http://scons.tigris.org/issues/show_bug.cgi?id=2683
         extraEnvArgs['WINDOWS_INSERT_DEF'] = 1
diff --git a/site_scons/buildutils.py b/site_scons/buildutils.py
index a2bebc2e6..dfdbd1c6b 100644
--- a/site_scons/buildutils.py
+++ b/site_scons/buildutils.py
@@ -373,7 +373,10 @@ def stripDrive(s):
 def which(program):
     """ Replicates the functionality of the 'which' shell command """
     def is_exe(fpath):
-        return os.path.exists(fpath) and os.access(fpath, os.X_OK)
+        for ext in ('', '.exe', '.bat'):
+            if os.path.exists(fpath + ext):
+                return os.access(fpath + ext, os.X_OK)
+        return False
 
     fpath, fname = os.path.split(program)
     if fpath:
diff --git a/src/SConscript b/src/SConscript
index af8cedb95..779a12ced 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -51,11 +51,11 @@ for subdir, extensions, setup in libs:
 localenv = env.Clone()
 lib = localenv.StaticLibrary('../lib/cantera', libraryTargets,
                              SPAWN=getSpawn(localenv))
+buildTargets.extend(lib)
 localenv.Depends(lib, localenv['config_h_target'])
 
 if localenv['addInstallTargets']:
     inst = localenv.Install('$inst_libdir', lib)
-    buildTargets.extend(lib)
     installTargets.extend(inst)
 
 # OS X requires the shared libraries at link time
@@ -67,9 +67,9 @@ if localenv['OS'] == 'Darwin' and localenv['use_sundials'] == 'y':
 lib = localenv.SharedLibrary('../lib/cantera_shared', libraryTargets,
                              SPAWN=getSpawn(localenv))
 env['cantera_shlib'] = lib
+buildTargets.extend(lib)
 localenv.Depends(lib, localenv['config_h_target'])
 
 if localenv['addInstallTargets']:
     inst = localenv.Install('$inst_libdir', lib)
-    buildTargets.extend(lib)
     installTargets.extend(inst)