Minor changes to reflect changes in the client library API.