Fix up for our monitored_client_interface stuff.