diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index 314b0f5b128d4a0bc9f064e54338330942edf778..9d06f42d8ad60d2d5962fba0dd0ab2279adbf1db 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -567,7 +567,7 @@ static void _append_to_job_list(struct select_cr_job *new_job)
 /*
  * _count_cpus - report how many cpus are available with the identified nodes 
  */
-static void _count_cpus(unsigned *bitmap, uint16_t *sum)
+static void _count_cpus(bitstr_t *bitmap, uint16_t *sum)
 {
 	int i, allocated_lps;
 	*sum = 0;
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 06aaea774b808ff63182d721979b458c8be38ba0..9c3b0980c756b3bca5049a4356ab67f76310552c 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -141,7 +141,7 @@ extern void allocate_nodes(struct job_record *job_ptr)
  * globals: node_record_count - number of nodes configured
  *	node_record_table_ptr - pointer to global node table
  */
-extern int count_cpus(unsigned *bitmap)
+extern int count_cpus(bitstr_t *bitmap)
 {
 	int i, sum;
 
diff --git a/src/slurmctld/node_scheduler.h b/src/slurmctld/node_scheduler.h
index 7febc9ad74a628daca6aab9bcf92a0f264911bc9..d44fa4eff0ccf26c3f1ea96459ef5df98cb92130 100644
--- a/src/slurmctld/node_scheduler.h
+++ b/src/slurmctld/node_scheduler.h
@@ -61,7 +61,7 @@ extern void build_node_details(struct job_record *job_ptr);
  * globals: node_record_count - number of nodes configured
  *	node_record_table_ptr - pointer to global node table
  */
-extern int count_cpus(unsigned *bitmap);
+extern int count_cpus(bitstr_t *bitmap);
 
 /*
  * deallocate_nodes - for a given job, deallocate its nodes and make
diff --git a/src/slurmd/slurmd/read_proc.c b/src/slurmd/slurmd/read_proc.c
index 5ed4ca0a16a11ad9e4c5062691b13421b2a65461..78b44f449ffc136f0e9ada6ba893c4467a708197 100644
--- a/src/slurmd/slurmd/read_proc.c
+++ b/src/slurmd/slurmd/read_proc.c
@@ -77,7 +77,7 @@ struct sess_record *session_ptr;
 int dump_proc(int uid, int sid);
 void init_proc(void);
 int parse_proc_stat(char* proc_stat, int *session, 
-		long unsigned *time, long *resident_set_size);
+		    unsigned long *time, long *resident_set_size);
 int read_proc();
 
 #if DEBUG_MODULE
@@ -178,7 +178,7 @@ init_proc (void)
  * RET - zero or errno code
  */
 int 
-parse_proc_stat(char* proc_stat, int *session, long unsigned *time, 
+parse_proc_stat(char* proc_stat, int *session, unsigned long *time, 
 		long *resident_set_size) {
 	int pid, ppid, pgrp, tty, tpgid;
 	char cmd[16], state[1];
@@ -239,7 +239,7 @@ read_proc()
 	struct stat buffer;
 	int uid, session;
 	long resident_set_size;
-	long unsigned time;
+	unsigned long time;
 	struct sess_record *s_ptr, *sess_free;
 
 	/* Initialization */
diff --git a/src/sview/block_info.c b/src/sview/block_info.c
index 47654ea7f6defd63557a2143ad8bb4359ee0001c..6e4251b6cabc8a3ca1000eb15f3a32afe8a0c2ba 100644
--- a/src/sview/block_info.c
+++ b/src/sview/block_info.c
@@ -350,7 +350,7 @@ static void _update_info_block(List block_list,
 		if(block_ptr->node_cnt == 0)
 			block_ptr->node_cnt = block_ptr->size;
 		if(!block_ptr->slurm_part_name)
-			block_ptr->slurm_part_name = "no part";
+			block_ptr->slurm_part_name = xstrdup("no part");
 		
 		/* get the iter, or find out the list is empty goto add */
 		if (!gtk_tree_model_get_iter(model, &iter, path)) {