Index: libcfa/src/concurrency/monitor.cfa
===================================================================
--- libcfa/src/concurrency/monitor.cfa	(revision dac5500446efde6cc36f8ce0afb6e51224e7d2ab)
+++ libcfa/src/concurrency/monitor.cfa	(revision 7030dab75c493bbd89de53cb88e496019c794ff4)
@@ -119,5 +119,5 @@
 
 		unlock( this->lock );
-		park();
+		park( __cfaabi_dbg_ctx );
 
 		__cfaabi_dbg_print_safe( "Kernel : %10p Entered  mon %p\n", thrd, this);
@@ -184,8 +184,8 @@
 		// Release the next thread
 		/* paranoid */ verifyf( urgent->owner->waiting_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
-		unpark( urgent->owner->waiting_thread );
+		unpark( urgent->owner->waiting_thread __cfaabi_dbg_ctx2 );
 
 		// Park current thread waiting
-		park();
+		park( __cfaabi_dbg_ctx );
 
 		// Some one was waiting for us, enter
@@ -205,5 +205,5 @@
 
 		// Park current thread waiting
-		park();
+		park( __cfaabi_dbg_ctx );
 
 		/* paranoid */ verifyf( kernelTLS.this_thread == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", kernelTLS.this_thread, this->owner, this->recursion, this );
@@ -247,5 +247,5 @@
 	//We need to wake-up the thread
 	/* paranoid */ verifyf( !new_owner || new_owner == this->owner, "Expected owner to be %p, got %p (m: %p)", new_owner, this->owner, this );
-	unpark( new_owner );
+	unpark( new_owner __cfaabi_dbg_ctx2 );
 }
 
@@ -460,9 +460,9 @@
 	// Wake the threads
 	for(int i = 0; i < thread_count; i++) {
-		unpark( threads[i] );
+		unpark( threads[i] __cfaabi_dbg_ctx2 );
 	}
 
 	// Everything is ready to go to sleep
-	park();
+	park( __cfaabi_dbg_ctx );
 
 	// We are back, restore the owners and recursions
@@ -542,8 +542,8 @@
 
 	// unpark the thread we signalled
-	unpark( signallee );
+	unpark( signallee __cfaabi_dbg_ctx2 );
 
 	//Everything is ready to go to sleep
-	park();
+	park( __cfaabi_dbg_ctx );
 
 
@@ -646,8 +646,8 @@
 
 				// unpark the thread we signalled
-				unpark( next );
+				unpark( next __cfaabi_dbg_ctx2 );
 
 				//Everything is ready to go to sleep
-				park();
+				park( __cfaabi_dbg_ctx );
 
 				// We are back, restore the owners and recursions
@@ -691,5 +691,5 @@
 
 	//Everything is ready to go to sleep
-	park();
+	park( __cfaabi_dbg_ctx );