Fix a couple of things in the client API