Small updates to Server and Client