Locking related fixes for networks