Update fix deadlocks