Small NetworkClient changes