Make some updates to metrics response handling.