Additional deadlock prevention