Finished fixing NetworkManagerClient.