diff --git a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py
index 1a0fe8def61b4b2ad1e79a4ba1b79cdb9755aaea..45f834fac1e148b8b8e4b5d3c2933a003044e94d 100755
--- a/var/spack/repos/builtin/packages/mvapich2-gdr/package.py
+++ b/var/spack/repos/builtin/packages/mvapich2-gdr/package.py
@@ -13,11 +13,11 @@ class Mvapich2Gdr(AutotoolsPackage):
     installable from source and is only available through a binary mirror.
     If you do not find the binary you're looking for, send us an email at
     mvapich@cse.ohio-state.edu. The binary mirror url is:
-    http://mvapich.cse.ohio-state.edu:8080/download/mvapich/spack-mirror/mvapich2-gdr/
+    http://mvapich.cse.ohio-state.edu/download/mvapich/spack-mirror/mvapich2-gdr/
     """
 
     homepage = 'http://mvapich.cse.ohio-state.edu'
-    url      = 'http://mvapich.cse.ohio-state.edu:8080/download/mvapich/spack-mirror/mvapich2-gdr/mvapich2-gdr-2.3.4.tar.gz'
+    url      = 'http://mvapich.cse.ohio-state.edu/download/mvapich/spack-mirror/mvapich2-gdr/mvapich2-gdr-2.3.4.tar.gz'
 
     maintainers = ['nithintsk', 'harisubramoni']
 
diff --git a/var/spack/repos/builtin/packages/mvapich2x/package.py b/var/spack/repos/builtin/packages/mvapich2x/package.py
index e164acc53cc75452d6a11ff250ed9501bf191aba..01f82c057d40ec6215dc973f7d4ebcb0d6f3f230 100755
--- a/var/spack/repos/builtin/packages/mvapich2x/package.py
+++ b/var/spack/repos/builtin/packages/mvapich2x/package.py
@@ -15,11 +15,11 @@ class Mvapich2x(AutotoolsPackage):
     runtime. MVAPICH2-X is not installable from source and is only available
     through a binary mirror. If you do not find the binary you're looking for,
     send us an email at mvapich@cse.ohio-state.edu. The binary mirror url is:
-    http://mvapich.cse.ohio-state.edu:8080/download/mvapich/spack-mirror/mvapich2x/
+    http://mvapich.cse.ohio-state.edu/download/mvapich/spack-mirror/mvapich2x/
     """
 
     homepage = "http://mvapich.cse.ohio-state.edu"
-    url      = "http://mvapich.cse.ohio-state.edu:8080/download/mvapich/spack-mirror/mvapich2x/mvapich2x-2.3.tar.gz"
+    url      = "http://mvapich.cse.ohio-state.edu/download/mvapich/spack-mirror/mvapich2x/mvapich2x-2.3.tar.gz"
 
     maintainers = ['nithintsk', 'harisubramoni']
 
@@ -174,11 +174,11 @@ def setup_build_environment(self, env):
 
     def setup_run_environment(self, env):
         if 'pmi_version=pmi1' in self.spec:
-            set('SLURM_MPI_TYPE', 'pmi1')
+            env.set('SLURM_MPI_TYPE', 'pmi1')
         if 'pmi_version=pmi2' in self.spec:
-            set('SLURM_MPI_TYPE', 'pmi2')
+            env.set('SLURM_MPI_TYPE', 'pmi2')
         if 'pmi_version=pmix' in self.spec:
-            set('SLURM_MPI_TYPE', 'pmix')
+            env.set('SLURM_MPI_TYPE', 'pmix')
 
         # Because MPI functions as a compiler, we need to treat it as one and
         # add its compiler paths to the run environment.