Fix Network services
Small fixes