Index: libcfa/src/concurrency/locks.hfa
===================================================================
--- libcfa/src/concurrency/locks.hfa	(revision 59f3f616c737817ce7af766fa1bcf77a79d695d9)
+++ libcfa/src/concurrency/locks.hfa	(revision 0583b47b57b7a7eb58c3a9ea379cbd621543903b)
@@ -197,6 +197,5 @@
 static inline $thread * unlock( fast_lock & this ) __attribute__((artificial));
 static inline $thread * unlock( fast_lock & this ) {
-	$thread * thrd = active_thread();
-	/* paranoid */ verify(thrd == this.owner);
+	/* paranoid */ verify(active_thread() == this.owner);
 
 	// open 'owner' before unlocking anyone
Index: libcfa/src/concurrency/ready_queue.cfa
===================================================================
--- libcfa/src/concurrency/ready_queue.cfa	(revision 59f3f616c737817ce7af766fa1bcf77a79d695d9)
+++ libcfa/src/concurrency/ready_queue.cfa	(revision 0583b47b57b7a7eb58c3a9ea379cbd621543903b)
@@ -413,5 +413,5 @@
 			unsigned it2  = proc->rdq.itr + 1;
 			unsigned idx1 = proc->rdq.id + (it1 % READYQ_SHARD_FACTOR);
-			unsigned idx2 = proc->rdq.id + (it1 % READYQ_SHARD_FACTOR);
+			unsigned idx2 = proc->rdq.id + (it2 % READYQ_SHARD_FACTOR);
 			unsigned long long tsc1 = ts(lanes.data[idx1]);
 			unsigned long long tsc2 = ts(lanes.data[idx2]);