more metrics fixes