Removed different potential multi-node deadlocks (maintenance)

Trying to fix #3824