Update to match changes to client API.