Network services fix
Small fixes in server class