Index: libcfa/src/concurrency/invoke.h
===================================================================
--- libcfa/src/concurrency/invoke.h	(revision 1b033b8dcae52f8f64c20a0c7e0428f00fd90de9)
+++ libcfa/src/concurrency/invoke.h	(revision a056f56794da880f8c293f2c3c87427b6dfe1cb6)
@@ -195,5 +195,5 @@
 
 		#if defined( __CFA_WITH_VERIFY__ )
-			unsigned long long canary;
+			void * canary;
 		#endif
 	};
Index: libcfa/src/concurrency/kernel.cfa
===================================================================
--- libcfa/src/concurrency/kernel.cfa	(revision 1b033b8dcae52f8f64c20a0c7e0428f00fd90de9)
+++ libcfa/src/concurrency/kernel.cfa	(revision a056f56794da880f8c293f2c3c87427b6dfe1cb6)
@@ -255,5 +255,5 @@
 		/* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) < ((uintptr_t)__get_stack(thrd_dst->curr_cor)->base ) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too small.\n", thrd_dst ); // add escape condition if we are setting up the processor
 		/* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit) || thrd_dst->curr_cor == proc_cor, "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst ); // add escape condition if we are setting up the processor
-		/* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
+		/* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
 
 
@@ -263,5 +263,5 @@
 		// when __cfactx_switch returns we are back in the processor coroutine
 
-		/* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_dst->canary );
+		/* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_dst->canary );
 		/* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) > ((uintptr_t)__get_stack(thrd_dst->curr_cor)->limit), "ERROR : Destination $thread %p has been corrupted.\n StackPointer too large.\n", thrd_dst );
 		/* paranoid */ verifyf( ((uintptr_t)thrd_dst->context.SP) < ((uintptr_t)__get_stack(thrd_dst->curr_cor)->base ), "ERROR : Destination $thread %p has been corrupted.\n StackPointer too small.\n", thrd_dst );
@@ -335,7 +335,7 @@
 		#endif
 		/* paranoid */ verify( proc_cor->context.SP );
-		/* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
+		/* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_src->canary );
 		__cfactx_switch( &thrd_src->context, &proc_cor->context );
-		/* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd_src->canary );
+		/* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd_src->canary );
 		#if defined( __i386 ) || defined( __x86_64 )
 			__x87_load;
@@ -370,5 +370,5 @@
 	/* paranoid */ #endif
 	/* paranoid */ verifyf( thrd->link.next == 0p, "Expected null got %p", thrd->link.next );
-	/* paranoid */ verify( 0x0D15EA5E0D15EA5E == thrd->canary );
+	/* paranoid */ verify( 0x0D15EA5E0D15EA5Ep == thrd->canary );
 
 
Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision 1b033b8dcae52f8f64c20a0c7e0428f00fd90de9)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision a056f56794da880f8c293f2c3c87427b6dfe1cb6)
@@ -456,5 +456,5 @@
 	link.prev = 0p;
 	#if defined( __CFA_WITH_VERIFY__ )
-		canary = 0x0D15EA5E0D15EA5E;
+		canary = 0x0D15EA5E0D15EA5Ep;
 	#endif
 
Index: libcfa/src/concurrency/thread.cfa
===================================================================
--- libcfa/src/concurrency/thread.cfa	(revision 1b033b8dcae52f8f64c20a0c7e0428f00fd90de9)
+++ libcfa/src/concurrency/thread.cfa	(revision a056f56794da880f8c293f2c3c87427b6dfe1cb6)
@@ -41,5 +41,5 @@
 	link.preferred = -1;
 	#if defined( __CFA_WITH_VERIFY__ )
-		canary = 0x0D15EA5E0D15EA5E;
+		canary = 0x0D15EA5E0D15EA5Ep;
 	#endif
 
@@ -53,5 +53,5 @@
 void ^?{}($thread& this) with( this ) {
 	#if defined( __CFA_WITH_VERIFY__ )
-		canary = 0xDEADDEADDEADDEAD;
+		canary = 0xDEADDEADDEADDEADp;
 	#endif
 	unregister(curr_cluster, this);