diff --git a/NEWS b/NEWS
index 43a7a6db016b69faa628be86a19943ad17ed3716..63d8e430a9a41ca4f3846a9fc134c05ca76259d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 This file describes changes in recent versions of SLURM. It primarily
 documents those changes that are of interest to users and admins.
 
+* Changes in SLURM 1.2.4
+========================
+ -- In select/cons_res - fix for function argument type mis-match in getting
+    CPU count for a job, from Ernest Artiaga, BSC.
+
 * Changes in SLURM 1.2.3
 ========================
  -- Cpuset logic added to  task/affinity, from Don Albert (Bull) and
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index f1e38b3022e6043903b7e773ee943fdbefeab422..342f6ab07c1451c2ad19eae0799c84f270bfa1f4 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -634,7 +634,7 @@ static int _synchronize_bitmaps(bitstr_t ** partially_idle_bitmap)
 	       bit_size(avail_node_bitmap), bit_size(idle_node_bitmap));
 
 	for (i = 0; i < node_record_count; i++) {
-		int allocated_cpus;
+		uint16_t allocated_cpus;
 		if (bit_test(avail_node_bitmap, i) != 1)
 			continue;
 
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 0e1d1401efba3c661e016d46f6ab37c4981bb1d3..952c043d44b6560f0ea2282ac6ae6ad763e5d3f7 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -870,7 +870,9 @@ _add_node_set_info(struct node_set *node_set_ptr,
 		   int job_id)
 {
         int error_code = SLURM_SUCCESS, i;
-	int this_cpu_cnt, this_mem_cnt, alloc_cpus, alloc_mem;
+	int this_cpu_cnt, this_mem_cnt;
+	uint32_t alloc_mem;
+	uint16_t alloc_cpus;
 
         xassert(node_set_ptr->my_bitmap);