Some more network improvements