NetworkClient and NetworkServer fixes