fix digestor and metrics