Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision fc59b580bf1b688acdfb86f4e29cc1f5c54fae03)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision a4b0aa4a6cf35811daa6308b31485b0648fc84e4)
@@ -469,4 +469,5 @@
 	this.name = name;
 	this.cltr = &_cltr;
+	this.cltr_id = -1u;
 	do_terminate = false;
 	preemption_alarm = 0p;
@@ -491,9 +492,9 @@
 	// Register and Lock the RWlock so no-one pushes/pops while we are changing the queue
 	uint_fast32_t last_size = ready_mutate_register((__processor_id_t*)&this);
-		int target = this.cltr->procs.total += 1u;
+		this.cltr->procs.total += 1u;
 		insert_last(this.cltr->procs.actives, this);
 
 		// Adjust the ready queue size
-		this.cltr_id = ready_queue_grow( cltr, target );
+		ready_queue_grow( cltr );
 
 	// Unlock the RWlock
@@ -507,9 +508,9 @@
 	// Lock the RWlock so no-one pushes/pops while we are changing the queue
 	uint_fast32_t last_size = ready_mutate_lock();
-		int target = this.cltr->procs.total -= 1u;
+		this.cltr->procs.total -= 1u;
 		remove(this);
 
 		// Adjust the ready queue size
-		ready_queue_shrink( this.cltr, target );
+		ready_queue_shrink( this.cltr );
 
 	// Unlock the RWlock and unregister: we don't need the read_lock any more
@@ -586,5 +587,5 @@
 
 		// Adjust the ready queue size
-		ready_queue_grow( &this, 0 );
+		ready_queue_grow( &this );
 
 	// Unlock the RWlock
@@ -601,5 +602,5 @@
 
 		// Adjust the ready queue size
-		ready_queue_shrink( &this, 0 );
+		ready_queue_shrink( &this );
 
 	// Unlock the RWlock