Eliminate deadlocks and false counters