Removed different potential multi-node deadlocks

 Trying to fix #3824