Minor fixes to client handling of new API.