Fix further deadlocks?