diff --git a/src/common/forward.c b/src/common/forward.c
index 2defafa41ed4bc2dcf5fcf27f044bfb925b3a779..9dc72f331c0a21aad5bb20ef480c0ce428db954c 100644
--- a/src/common/forward.c
+++ b/src/common/forward.c
@@ -84,10 +84,12 @@ void *_forward_thread(void *arg)
 			slurm_mutex_lock(fwd_msg->forward_mutex);
 			mark_as_failed_forward(&fwd_msg->ret_list, name,
 					       SLURM_SOCKET_ERROR);
-			slurm_mutex_unlock(fwd_msg->forward_mutex);
-
-			free(name);
-			continue;
+ 			free(name);
+			if (hostlist_count(hl) > 0) {
+				slurm_mutex_unlock(fwd_msg->forward_mutex);
+				continue;
+			}
+			goto cleanup;			
 		}
 		if ((fd = slurm_open_msg_conn(&addr)) < 0) {
 			error("forward_thread to %s: %m", name);
@@ -95,10 +97,12 @@ void *_forward_thread(void *arg)
 			slurm_mutex_lock(fwd_msg->forward_mutex);
 			mark_as_failed_forward(&fwd_msg->ret_list, name,
 					       SLURM_SOCKET_ERROR);
-			slurm_mutex_unlock(fwd_msg->forward_mutex);
-
 			free(name);
-			continue;
+			if (hostlist_count(hl) > 0) {
+				slurm_mutex_unlock(fwd_msg->forward_mutex);
+				continue;
+			}
+			goto cleanup;			
 		}
 		hostlist_ranged_string(hl, sizeof(buf), buf);
 
@@ -137,12 +141,14 @@ void *_forward_thread(void *arg)
 			slurm_mutex_lock(fwd_msg->forward_mutex);
 			mark_as_failed_forward(&fwd_msg->ret_list, name, 
 					       errno);
-			slurm_mutex_unlock(fwd_msg->forward_mutex);
-			
-			free_buf(buffer);	
 			free(name);
-			buffer = init_buf(0);
-			continue;
+			if (hostlist_count(hl) > 0) {
+				free_buf(buffer);	
+				buffer = init_buf(0);
+				slurm_mutex_unlock(fwd_msg->forward_mutex);
+				continue;
+			}
+			goto cleanup;			
 		}
 
 		if ((fwd_msg->header.msg_type == REQUEST_SHUTDOWN) ||
@@ -178,12 +184,16 @@ void *_forward_thread(void *arg)
 			slurm_mutex_lock(fwd_msg->forward_mutex);
 			mark_as_failed_forward(&fwd_msg->ret_list, name, 
 					       errno);
-			slurm_mutex_unlock(fwd_msg->forward_mutex);
-			
-			free_buf(buffer);	
 			free(name);
-			buffer = init_buf(0);
-			continue;
+			if(ret_list)
+				list_destroy(ret_list);
+			if (hostlist_count(hl) > 0) {
+				free_buf(buffer);	
+				buffer = init_buf(0);
+				slurm_mutex_unlock(fwd_msg->forward_mutex);
+				continue;
+			}
+			goto cleanup;			
 		}
 		break;
 	}
diff --git a/src/sview/part_info.c b/src/sview/part_info.c
index d0465e92da71d21c401f0f16e5b64c1813e8952e..1dbe066dbae96d49a922b09e4b5755207ab7b69b 100644
--- a/src/sview/part_info.c
+++ b/src/sview/part_info.c
@@ -197,7 +197,7 @@ _build_min_max_32_string(char *buffer, int buf_size,
 	if (max == min)
 		return snprintf(buffer, buf_size, "%s", tmp_max);
 	else if (range) {
-		if (max == INFINITE)
+		if (max == (uint32_t) INFINITE)
 			return snprintf(buffer, buf_size, "%s-infinite", 
 					tmp_min);
 		else