Avoid deadlocks, more debugging info.