several metrics fixes