More deadlock resolution debugging and improvement