diff --git a/src/api/config_info.c b/src/api/config_info.c
index f3801fedfa68cb80de75dbbf3f4963a7265db397..cf5f3e9c34aa044d4103245002a47ad5547487a9 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -77,7 +77,7 @@ slurm_load_build (time_t update_time, struct build_table **build_table_ptr )
                         break ;
                 case RESPONSE_SLURM_RC:
                         rc_msg = ( return_code_msg_t * ) response_msg . data ; 
-			return rc_msg->return_code ;
+			return (int) rc_msg->return_code ;
                         break ;
                 default:
 			return SLURM_UNEXPECTED_MSG_ERROR ;
diff --git a/src/api/job_info.c b/src/api/job_info.c
index d58ae7eef845d9710d14289e2c69f2bc59b9e7c5..ce3b445954fd54a03580210d17f19423ed35520e 100644
--- a/src/api/job_info.c
+++ b/src/api/job_info.c
@@ -130,10 +130,11 @@ slurm_load_jobs (time_t update_time, job_info_msg_t **job_info_msg_pptr)
 	{
 		case RESPONSE_JOB_INFO:
         		 *job_info_msg_pptr = ( job_info_msg_t * ) response_msg . data ;
+		        return SLURM_SUCCESS ;
 			break ;
 		case RESPONSE_SLURM_RC:
 			rc_msg = ( return_code_msg_t * ) response_msg . data ;
-                        return rc_msg -> return_code ;
+			return (int) rc_msg->return_code ;
 			break ;
 		default:
 			return SLURM_UNEXPECTED_MSG_ERROR ;
diff --git a/src/api/node_info.c b/src/api/node_info.c
index 2a03d1ee99dab9449dc1ce9f34ab12795becd8c6..9eae18bf99830eec0bb510a3362fa86f73b803e8 100644
--- a/src/api/node_info.c
+++ b/src/api/node_info.c
@@ -113,15 +113,17 @@ slurm_load_node (time_t update_time, node_info_msg_t **node_info_msg_pptr)
 	{
 		case RESPONSE_NODE_INFO:
         		 *node_info_msg_pptr = ( node_info_msg_t * ) response_msg . data ;
+		        return SLURM_SUCCESS ;
 			break ;
 		case RESPONSE_SLURM_RC:
 			slurm_rc_msg = ( return_code_msg_t * ) response_msg . data ;
+			return  (int) slurm_rc_msg->return_code ;
 			break ;
 		default:
 			return SLURM_UNEXPECTED_MSG_ERROR ;
-			break ;
 	}
 
-        return SLURM_SUCCESS ;
+	return SLURM_SUCCESS ;
+
 }
 
diff --git a/src/api/partition_info.c b/src/api/partition_info.c
index c7db112aab9e4270f687c3aaeca484d378c355d7..ed70156ad854e776cc5eb0cbdaeb5b1fe1ef7acf 100644
--- a/src/api/partition_info.c
+++ b/src/api/partition_info.c
@@ -106,15 +106,17 @@ slurm_load_partitions (time_t update_time, partition_info_msg_t **partition_info
 	switch ( response_msg . msg_type )
 	{
 		case RESPONSE_PARTITION_INFO:
-        		 *partition_info_msg_pptr = ( partition_info_msg_t * ) response_msg . data ;
+        		*partition_info_msg_pptr = ( partition_info_msg_t * ) response_msg . data ;
+			return SLURM_SUCCESS ;
 			break ;
 		case RESPONSE_SLURM_RC:
 			slurm_rc_msg = ( return_code_msg_t * ) response_msg . data ;
+			return (int) slurm_rc_msg->return_code ;
 			break ;
 		default:
 			return SLURM_UNEXPECTED_MSG_ERROR ;
 			break ;
 	}
 
-        return SLURM_SUCCESS ;
+	return SLURM_SUCCESS ;
 }
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index e89ef8d63d9a049f3fc79ef5b199e2e8a0a1dfac..21c1fea4f30276893e605e50ff6de5f49f80feb2 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -143,12 +143,6 @@ int slurm_receive_msg ( slurm_fd open_fd , slurm_msg_t * msg )
 		info ( "Error recieving msg socket: errno %i\n", errno ) ;
 		return rc ;
 	}
-#if 0
-printf("read %d,%d bytes\n",receive_len,unpack_len);
-for (i=0; i<30; i++) 
-printf("%c=%x ",buffer[i],(int)buffer[i]);
-printf("\n");
-#endif
 
 	/* unpack header */
 	unpack_len = rc ;
@@ -208,7 +202,7 @@ int slurm_send_node_msg ( slurm_fd open_fd ,  slurm_msg_t * msg )
 	char buf_temp[SLURM_PROTOCOL_MAX_MESSAGE_BUFFER_SIZE] ;
 	char * buffer = buf_temp ;
 	header_t header ;
-	int rc ;
+	int i, rc ;
 	unsigned int pack_len ;
 
 	/* initheader */
@@ -252,12 +246,6 @@ int slurm_receive_buffer ( slurm_fd open_fd , slurm_addr * source_address , slur
 		info ( "Error recieving msg socket: errno %i\n", errno ) ;
 		return rc ;
 	}
-#if 0
-printf("read %d,%d bytes\n",receive_len,unpack_len);
-for (i=0; i<30; i++) 
-printf("%c=%x ",buffer[i],(int)buffer[i]);
-printf("\n");
-#endif
 
 	/* unpack header */
 	unpack_len = rc ;
diff --git a/src/scontrol/scontrol.c b/src/scontrol/scontrol.c
index 754a793309086cd6353ae0d1cd2c7065e29adf6d..4a306950c878fd6efcb98db67993dec2fa13b2d5 100644
--- a/src/scontrol/scontrol.c
+++ b/src/scontrol/scontrol.c
@@ -465,9 +465,6 @@ print_node_list (char *node_list)
 		}		
 		xfree (my_node_list);
 	}			
-/* Temporary logic to clean out immediately */
-slurm_free_node_info (old_node_info_ptr);
-old_node_info_ptr=NULL;
 	return;
 }
 
@@ -488,7 +485,7 @@ print_part (char *partition_name)
 		error_code = slurm_load_partitions (old_part_info_ptr->last_update, 
 					&part_info_ptr);
 		if (error_code == 0) {
-/*			slurm_free_partition_info (old_part_info_ptr); */
+			slurm_free_partition_info (old_part_info_ptr);
 		}
 		else if (error_code == SLURM_NO_CHANGE_IN_DATA) {
 			part_info_ptr = old_part_info_ptr;
@@ -519,9 +516,6 @@ print_part (char *partition_name)
 		if (partition_name)
 			break;
 	}
-/* Temporary logic to clean out immediately */
-slurm_free_partition_info (old_part_info_ptr);
-old_part_info_ptr=NULL;
 }
 
 
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 039d6da489ecc92c91ad4bafe954abff2eed14cc..a1eda807ed8ea43345166eb5a8c77d1d030c076c 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -19,7 +19,7 @@
 #include "pack.h"
 #include "slurmctld.h"
 #include "xstring.h"
-#include <src/common/slurm_errno.h>
+#include <src/common/slurm_protocol_errno.h>
 
 #define BUF_SIZE 1024
 #define MAX_STR_PACK 128