fixes related to network&mp

this pr fixes bugs. Especialy 2 bugs introduced in pr 121.
but also also 21397.