Index: libcfa/src/concurrency/kernel.cfa
===================================================================
--- libcfa/src/concurrency/kernel.cfa	(revision c9ec3017897316e3c912db439768ec9863539988)
+++ libcfa/src/concurrency/kernel.cfa	(revision 5cb51502e28636216bff5a848f33135247a26426)
@@ -490,6 +490,5 @@
 			{
 				/* paranoid */ verify( publicTLS_get(this_proc_id) );
-				bool full = publicTLS_get(this_proc_id)->full_proc;
-				if(full) disable_interrupts();
+				disable_interrupts();
 
 				/* paranoid */ verify( ! __preemption_enabled() );
@@ -500,5 +499,5 @@
 				/* paranoid */ verify( ! __preemption_enabled() );
 
-				if(full) enable_interrupts( __cfaabi_dbg_ctx );
+				enable_interrupts_noPoll();
 				/* paranoid */ verify( publicTLS_get(this_proc_id) );
 			}
@@ -609,5 +608,10 @@
 
 	#if !defined(__CFA_NO_STATISTICS__)
-		__tls_stats()->ready.sleep.wakes++;
+		if( kernelTLS().this_stats ) {
+			__tls_stats()->ready.sleep.wakes++;
+		}
+		else {
+			__atomic_fetch_add(&this->stats->ready.sleep.wakes, 1, __ATOMIC_RELAXED);
+		}
 	#endif
 
Index: libcfa/src/concurrency/kernel.hfa
===================================================================
--- libcfa/src/concurrency/kernel.hfa	(revision c9ec3017897316e3c912db439768ec9863539988)
+++ libcfa/src/concurrency/kernel.hfa	(revision 5cb51502e28636216bff5a848f33135247a26426)
@@ -51,5 +51,4 @@
 struct __processor_id_t {
 	unsigned id:24;
-	bool full_proc:1;
 
 	#if !defined(__CFA_NO_STATISTICS__)
Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision c9ec3017897316e3c912db439768ec9863539988)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision 5cb51502e28636216bff5a848f33135247a26426)
@@ -455,5 +455,4 @@
 	this.name = name;
 	this.cltr = &_cltr;
-	full_proc = true;
 	do_terminate = false;
 	preemption_alarm = 0p;
Index: libcfa/src/concurrency/ready_queue.cfa
===================================================================
--- libcfa/src/concurrency/ready_queue.cfa	(revision c9ec3017897316e3c912db439768ec9863539988)
+++ libcfa/src/concurrency/ready_queue.cfa	(revision 5cb51502e28636216bff5a848f33135247a26426)
@@ -245,7 +245,5 @@
 	__cfadbg_print_safe(ready_queue, "Kernel : Pushing %p on cluster %p\n", thrd, cltr);
 
-	#if !defined(__CFA_NO_STATISTICS__)
-		const bool external = (!kernelTLS().this_proc_id->full_proc) || (cltr != kernelTLS().this_processor->cltr);
-	#endif
+	const bool external = (!kernelTLS().this_processor) || (cltr != kernelTLS().this_processor->cltr);
 
 	// write timestamp
@@ -258,5 +256,5 @@
 		preferred =
 			//*
-			kernelTLS().this_processor ? kernelTLS().this_processor->cltr_id : -1;
+			external ? -1 : kernelTLS().this_processor->cltr_id;
 			/*/
 			thrd->link.preferred * 4;