Changes related to metrics and graphutils.