Fix some possible deadlocks/freezes and reduce lock contention (improving performance). Contributed by @Jade