Updates to match the JS client.