Index: tests/concurrency/unified_locking/mcs.cfa
===================================================================
--- tests/concurrency/unified_locking/mcs.cfa	(revision 10b5970650e2ff3d8e757dd5c91889d466e44fe0)
+++ tests/concurrency/unified_locking/mcs.cfa	(revision 195f43d73b60226c8860a64dac47254935cbaae1)
@@ -22,5 +22,5 @@
 unsigned cs() {
 	thread$ * me = active_thread();
-	unsigned value = (unsigned)me;
+	unsigned value = (uintptr_t)me;
 	mcs_node n;
 	lock(mo.l, n);
Index: tests/concurrency/unified_locking/mcs_spin.cfa
===================================================================
--- tests/concurrency/unified_locking/mcs_spin.cfa	(revision 10b5970650e2ff3d8e757dd5c91889d466e44fe0)
+++ tests/concurrency/unified_locking/mcs_spin.cfa	(revision 195f43d73b60226c8860a64dac47254935cbaae1)
@@ -32,5 +32,5 @@
 		mo.id = me;
 		yield(random(5));
-		value = ((uint32_t)random()) ^ ((uint32_t)me);
+		value = ((uint32_t)random()) ^ ((uint32_t)(uintptr_t)me);
 		if(mo.id != me) sout | "Intruder!";
 		mo.cnt = cnt + 1;
Index: tests/concurrency/unified_locking/mutex_test.hfa
===================================================================
--- tests/concurrency/unified_locking/mutex_test.hfa	(revision 10b5970650e2ff3d8e757dd5c91889d466e44fe0)
+++ tests/concurrency/unified_locking/mutex_test.hfa	(revision 195f43d73b60226c8860a64dac47254935cbaae1)
@@ -32,5 +32,5 @@
 		mo.id = me;
 		yield(random(5));
-		value = ((uint32_t)random()) ^ ((uint32_t)me);
+		value = ((uint32_t)random()) ^ ((uint32_t)(uintptr_t)me);
 		if(mo.id != me) sout | "Intruder!";
 		mo.cnt = cnt + 1;
Index: tests/concurrency/unified_locking/timeout_lock.cfa
===================================================================
--- tests/concurrency/unified_locking/timeout_lock.cfa	(revision 10b5970650e2ff3d8e757dd5c91889d466e44fe0)
+++ tests/concurrency/unified_locking/timeout_lock.cfa	(revision 195f43d73b60226c8860a64dac47254935cbaae1)
@@ -23,5 +23,5 @@
 thread T1 {};
 
-void main( T1 & this ) {
+void main( T1 & ) {
 	lock(m);
 	wait( c_m, m, 1`s );
@@ -46,5 +46,5 @@
 thread T2 {};
 
-void main( T2 & this ) {
+void main( T2 & ) {
 	block();