diff --git a/src/common/mpi.c b/src/common/mpi.c
index c2482a599da8efe5b87ec8a8f8b381cca8797fb2..8bf421b65bdf45e8c75724955c8fdc01f6499a60 100644
--- a/src/common/mpi.c
+++ b/src/common/mpi.c
@@ -36,7 +36,6 @@
 #include "src/common/xmalloc.h"
 #include "src/common/xstring.h"
 
-#define MPI_DEFAULT "mpich-gm"
 
 /*
  * WARNING:  Do not change the order of these fields or add additional
@@ -188,9 +187,9 @@ int _mpi_init (char *mpi_type)
 		got_default = 1;
 	}
 	if (mpi_type == NULL) {
-		error("No MPI default set in slurm.conf using %s.",
-		      MPI_DEFAULT);
-		mpi_type = MPI_DEFAULT;
+		error("No MPI default set.");
+		retval = SLURM_ERROR;
+		goto done;		
 	}
 	setenvf (NULL, "SLURM_MPI_TYPE", "%s", mpi_type);
 		
diff --git a/src/plugins/mpi/lam/mpi_lam.c b/src/plugins/mpi/lam/mpi_lam.c
index 625269d2116c67da18d44d3c8f858e270cce5123..8e49c8e8978cad49c9ed62644c9276670569e72f 100644
--- a/src/plugins/mpi/lam/mpi_lam.c
+++ b/src/plugins/mpi/lam/mpi_lam.c
@@ -70,6 +70,7 @@ const uint32_t plugin_version   = 100;
 
 int mpi_p_init(slurmd_job_t *job)
 {
+	debug("Using mpi/lam");
 	return 0;
 }
 
diff --git a/src/plugins/mpi/mpichgm/mpi_mpichgm.c b/src/plugins/mpi/mpichgm/mpi_mpichgm.c
index a4f0eb5909d656a06fa0353fdda69a54dec15042..40d39b04e048d8aad903c6221f925256458a7949 100644
--- a/src/plugins/mpi/mpichgm/mpi_mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpi_mpichgm.c
@@ -74,6 +74,7 @@ int mpi_p_init(slurmd_job_t *job, int rank)
 	char *p;
 	char *addr = getenvp (job->env, "SLURM_LAUNCH_NODE_IPADDR");
 	
+	debug("Using mpi/mpich-gm");
 	slurm_print_slurm_addr (job->envtp->self, addrbuf, sizeof(addrbuf));
 	
 	if ((p = strchr (addrbuf, ':')) != NULL)
diff --git a/src/plugins/mpi/mvapich/mpi_mvapich.c b/src/plugins/mpi/mvapich/mpi_mvapich.c
index bb0741f8e3a7b7c5faf90b31747e23f712f6a922..17ad0166cea22cc2126ee0f1e755c10c25a68468 100644
--- a/src/plugins/mpi/mvapich/mpi_mvapich.c
+++ b/src/plugins/mpi/mvapich/mpi_mvapich.c
@@ -74,11 +74,12 @@ int mpi_p_init (slurmd_job_t *job, int rank)
 	char *processes = NULL;
 	char *addr = getenvp (job->env, "SLURM_LAUNCH_NODE_IPADDR");
 
+	debug("Using mpi/mvapich");
 	setenvf (&job->env, "MPIRUN_HOST", "%s", addr);
 	setenvf (&job->env, "MPIRUN_RANK", "%d", rank);
 	setenvf (&job->env, "MPIRUN_MPD", "0");
 
-	info ("init for mpi rank %d\n", rank);
+	debug2("init for mpi rank %d\n", rank);
 	/*
 	 * Fake MPIRUN_PROCESSES env var -- we don't need this for
 	 *  SLURM at this time. (what a waste)
diff --git a/src/smap/job_functions.c b/src/smap/job_functions.c
index 9a5087c02725e94173a7e212a84a34e714faa89b..f9f24660e228ec3865675b079a64e11c8af60182 100644
--- a/src/smap/job_functions.c
+++ b/src/smap/job_functions.c
@@ -79,7 +79,8 @@ extern void get_job()
 		job = new_job_ptr->job_array[i];
 		
 		if ((job.job_state == JOB_COMPLETE)
-		||  (job.job_state == JOB_END))
+		    || (job.job_state == JOB_END)
+		    || (job.job_state == JOB_FAILED))
 			continue;	/* job has completed */
 
 		if (job.node_inx[0] != -1) {